Skip to content

Commit

Permalink
Merge pull request #107 from linea-it/106-combine-specz-from-pzserver…
Browse files Browse the repository at this point in the history
…-lib

106 combine specz from pzserver lib
  • Loading branch information
gschwend authored Sep 20, 2024
2 parents 4d3fd15 + cb8a553 commit 3202ea7
Show file tree
Hide file tree
Showing 3 changed files with 250 additions and 98 deletions.
1 change: 1 addition & 0 deletions src/pzserver/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@

from .catalog import Catalog, SpeczCatalog, TrainingSet
from .core import PzServer
from .pipeline import Pipeline
22 changes: 9 additions & 13 deletions src/pzserver/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from .catalog import SpeczCatalog, TrainingSet
from .communicate import PzRequests
from .process import TSMProcess
from .process import CSCProcess, TSMProcess
from .upload import PzUpload, UploadData

pd.options.display.max_colwidth = None
Expand Down Expand Up @@ -463,22 +463,17 @@ def __transform_df(self, dataframe, metadata):

return results

# ---- Training Set Maker methods ----#
def combine_specz_catalogs(self, catalog_list, duplicates_critera="smallest flag"):
"""_summary_
def combine_specz_catalogs(self, name):
"""
Make combine specz
Args:
catalog_list (_type_): _description_
duplicates_critera (str, optional): _description_. Defaults to "smallest flag".
name (str): combine specz name
Raises:
NotImplementedError: _description_
Return:
CSCProcess: CSCProcess object
"""
# criteria: smallest flag, smallest error
# newest survey
# show progress bar
# return SpeczCatalog object
raise NotImplementedError
return CSCProcess(name, self.api)

def make_training_set(self, name):
"""
Expand All @@ -497,6 +492,7 @@ def wait_processing(self, process):
Wait for processing to finish (30 minute tolerance time)
Args:
process (TSMProcess or CombSpeczProcess): process object
Return:
Expand Down
Loading

0 comments on commit 3202ea7

Please sign in to comment.