pzserver 0.2.6__tar.gz → 0.2.7__tar.gz

{pzserver-0.2.6 → pzserver-0.2.7}/.github/workflows/build-documentation.yml

@@ -30,7 +30,7 @@ jobs:
         sudo apt-get install pandoc
     - name: Build docs
       run: |
-        sphinx-build -T -E -b html -d docs/build/doctrees ./docs docs/build/html -D exclude_patterns="notebooks/*.ipynb"
+        sphinx-build -T -E -b html -d docs/build/doctrees ./docs docs/build/html -D exclude_patterns="notebooks/*/*.ipynb"
     - name: Run ghp-import
       run: | 
         ghp-import -n -p -f -x docs/ docs/build/html

{pzserver-0.2.6 → pzserver-0.2.7}/.pre-commit-config.yaml

@@ -103,25 +103,25 @@ repos:
     # notebooks from the docs, so users don't have to wait through the execution 
     # of each notebook or each commit. By default, these will be checked in the 
     # GitHub workflows.
-   - repo: local
+  - repo: local
     hooks:
-       - id: sphinx-build
-         name: Build documentation with Sphinx
-         entry: sphinx-build
-         language: system
-         always_run: true
-         exclude_types: [file, symlink]
-         args:
-           [
-             "-M", # Run sphinx in make mode, so we can use -D flag later
-                   # Note: -M requires next 3 args to be builder, source, output
-             "html", # Specify builder
-             "./docs", # Source directory of documents
-             "./build", # Output directory for rendered documents
-             "-T", # Show full trace back on exception
-             "-E", # Don't use saved env; always read all files
-             "-d", # Flag for cached environment and doctrees
-             "./docs/build/doctrees", # Directory
-             "-D", # Flag to override settings in conf.py
-             "exclude_patterns=notebooks/*.ipynb", # Exclude our notebooks from pre-commit
+      - id: sphinx-build
+        name: Build documentation with Sphinx
+        entry: sphinx-build
+        language: system
+        always_run: true
+        exclude_types: [file, symlink]
+        args:
+          [
+            "-M", # Run sphinx in make mode, so we can use -D flag later
+                  # Note: -M requires next 3 args to be builder, source, output
+            "html", # Specify builder
+            "./docs", # Source directory of documents
+            "./build", # Output directory for rendered documents
+            "-T", # Show full trace back on exception
+            "-E", # Don't use saved env; always read all files
+            "-d", # Flag for cached environment and doctrees
+            "./docs/build/doctrees", # Directory
+            "-D", # Flag to override settings in conf.py
+            "exclude_patterns=notebooks/*/*.ipynb", # Exclude our notebooks from pre-commit
           ]

{pzserver-0.2.6 → pzserver-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pzserver
-Version: 0.2.6
+Version: 0.2.7
 Author-email: LIneA <itteam@linea.org.br>
 License: MIT License
         

{pzserver-0.2.6 → pzserver-0.2.7}/src/pzserver/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.2.6'
-__version_tuple__ = version_tuple = (0, 2, 6)
+__version__ = version = '0.2.7'
+__version_tuple__ = version_tuple = (0, 2, 7)

{pzserver-0.2.6 → pzserver-0.2.7}/src/pzserver/core.py

@@ -135,9 +135,9 @@ class PzServer:
         names (optimized for use in Jupyter Notebook).
         """
         results_dict = self.api.get_all("releases")
-        dataframe = pd.DataFrame(results_dict, columns=["display_name", "description"])
+        dataframe = pd.DataFrame(results_dict, columns=["name", "display_name", "description"])
         dataframe.rename(
-            columns={"display_name": "Release", "description": "Description"},
+            columns={"name": "Name", "display_name": "Release", "description": "Description"},
             inplace=True,
         )
         display(dataframe.style.hide(axis="index"))
@@ -475,7 +475,7 @@ class PzServer:
         """
         return CSCProcess(name, self.api)
 
-    def make_training_set(self, name):
+    def training_set_maker(self, name):
         """
         Make training set
 
@@ -487,7 +487,7 @@ class PzServer:
         """
         return TSMProcess(name, self.api)
 
-    def wait_processing(self, process):
+    def run_and_wait(self, process):
         """
         Wait for processing to finish (30 minute tolerance time)
 
@@ -499,11 +499,28 @@ class PzServer:
             dict: process status
         """
 
-        retry = 30
+        retry = 60
         process.run()
 
+        print("Process submitted successfully, waiting for completion...")
+
         while process.check_status() in ("Running", "Pending") and retry:
-            time.sleep(60)
+            time.sleep(30)
             retry = retry - 1
 
-        return process.check_status()
+        check_status = process.check_status()
+
+        if retry == 0:
+            msg = "This process is taking longer than 30 minutes, please "
+            msg += "continue monitoring it asynchronously with the "
+            msg += "check_status() method"
+            print(f"{FONTCOLORERR}{msg}{FONTCOLOREND}")
+
+        elif check_status == "Failed":
+            msg = f"Process failed with the following error: {process.output.get('error')}"
+            print(f"{FONTCOLORERR}{msg}{FONTCOLOREND}")
+
+        elif check_status == "Successful":
+            msg = f"Done! Results registered as ID={process.output.get('id')} "
+            msg += f"(internal_name: {process.output.get('internal_name')})"
+            print(msg)

{pzserver-0.2.6 → pzserver-0.2.7}/src/pzserver/process.py

@@ -110,6 +110,10 @@ class Process:
         """
         self.__inputs.append(input_id)
 
+    def empty_input(self):
+        """ Empty inputs list
+        """
+        self.__inputs = []
 
     @property
     def config(self):
@@ -265,12 +269,12 @@ class TSMProcess(Process):
         """
         return self.__release
 
-    def set_release(self, release_id=None, name=None):
+    def set_release(self, name=None, release_id=None):
         """Set release
 
         Args:
-            release_id (int, optional): release ID. Defaults to None.
             name (str, optional): release name. Defaults to None.
+            release_id (int, optional): release ID. Defaults to None.
 
         Raises:
             ValueError: when neither release_id nor name is informed, the raise is triggered
@@ -303,7 +307,9 @@ class TSMProcess(Process):
             ValueError: when neither specz_id nor internal_name is informed, the raise is triggered
         """
 
+
         self.__specz = self.get_product(product_id=specz_id, internal_name=internal_name)
+        self.empty_input()
         self.append_input(self.specz.get("id"))
 
     def summary(self, extra_info=None):
@@ -387,15 +393,17 @@ class CSCProcess(Process):
         """
 
         specz = self.get_product(product_id=specz_id, internal_name=internal_name)
+        specz_id = specz.get("id")
 
-        dn_specz = {
-            "name": specz.get("display_name"),
-            "internal_name": specz.get("internal_name"),
-            "id": specz.get("id"),
-        }
+        if not specz_id in self.inputs:
+            dn_specz = {
+                "name": specz.get("display_name"),
+                "internal_name": specz.get("internal_name"),
+                "id": specz_id,
+            }
 
-        self.__catalogs.append(dn_specz)
-        self.append_input(specz.get("id"))
+            self.__catalogs.append(dn_specz)
+            self.append_input(specz_id)
 
     def summary(self, extra_info=None):
         """Summary of what will be executed"""

{pzserver-0.2.6 → pzserver-0.2.7}/src/pzserver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pzserver
-Version: 0.2.6
+Version: 0.2.7
 Author-email: LIneA <itteam@linea.org.br>
 License: MIT License