psr-factory 5.0.0b14__py3-none-win_amd64.whl → 5.0.0b16__py3-none-win_amd64.whl

psr/cloud/cloud.py

@@ -961,7 +961,9 @@ class Client:
             "sessao_id": section,
             "tipo_autenticacao": "bcrypt",
             "idioma": "3",
-            "versao_cliente": self._get_console_version().split("-")[0],
+            "versao_cliente": self._get_console_version().split("-")[0]
+            if not self._python_client
+            else "5.4.0",
         }
         if additional_arguments:
             parameters.update(additional_arguments)

psr/execqueue/client.py

@@ -1,7 +1,7 @@
 import os
 import zipfile
 import requests
-from typing import List, Optional
+from typing import List, Optional, Tuple
 
 
 def zip_directory(directory_path, output_zip):
@@ -70,21 +70,13 @@ def upload_and_run_file(zip_path: str, server_url: str, cloud_execution: bool =
         return None
 
 
-def get_execution_status(execution_id: str, server_url: str, cloud_execution: bool = False, return_status_id: bool = False) -> Optional[str]:
+def get_execution_status(execution_id: str, server_url: str, cloud_execution: bool = False, return_status_id: bool = False) -> Tuple[bool, dict]:
     """Get the status of an execution."""
-    print("Getting status for execution ID:", execution_id)
     data = {'cloud_execution': cloud_execution, 'return_status_id': return_status_id}
     response = requests.get(f"{server_url}/status/{execution_id}", data=data)
+    result = response.status_code == 200
+    return result, response.json()
 
-    if response.status_code == 200:
-        if return_status_id:
-            print("Status ID:", response.json().get('status_id'))
-            return response.json().get('status_id') 
-        print("Status:", response.json().get('status'))
-        return response.json().get('status')
-    else:
-        print("Failed to get status:", response.text)
-        return None
 
 def get_results(execution_id, server_url, cloud_execution=False) -> Optional[List[str]]:
     """Download the results of an execution."""

psr/execqueue/server.py

@@ -299,13 +299,13 @@ def get_status(execution_id):
         if return_status_id:
             return jsonify({'status_id': status}), 200
         if status == db.CloudStatus.ERROR.value:
-            return jsonify({'status': 'Execution finished with errors'}), 200
+            return jsonify({'message': 'Execution finished with errors'}), 200
         elif status == db.CloudStatus.RUNNING.value:
-            return jsonify({'status': 'Execution not finished yet'}), 200
+            return jsonify({'message': 'Execution not finished yet'}), 200
         elif status == db.CloudStatus.FINISHED.value:
-            return jsonify({'status': 'Execution finished, but download not yet downloaded from Cloud server'}), 200
+            return jsonify({'message': 'Execution finished, but download not yet downloaded from Cloud server'}), 200
         elif status == db.CloudStatus.RESULTS_AVAILABLE.value:
-            return jsonify({'status': 'Execution finished and results are available to download'}), 200
+            return jsonify({'message': 'Execution finished and results are available to download'}), 200
 
 @app.route('/results/<execution_id>', methods=['GET'])
 def get_results(execution_id: str):

psr/execqueue/watcher.py

@@ -73,7 +73,10 @@ def _check_and_download_results():
     rows = cursor.fetchall()
     for row in rows:
         record_id, filename, cloud_upload_id = row
-        status = execqueue.get_execution_status(cloud_upload_id, SERVER_URL, cloud_execution=True, return_status_id=True)
+        result, response = execqueue.get_execution_status(cloud_upload_id, SERVER_URL, cloud_execution=True, return_status_id=True)
+        status = response.get('status_id', 0)
+        message = response.get('message', None)
+        error = response.get('error', None)
         if status == "5" or status == 5:
             files = execqueue.get_results(cloud_upload_id, SERVER_URL, cloud_execution=True)
             if files:
@@ -92,6 +95,7 @@ def _check_and_download_results():
             logging.info(f"Execution {cloud_upload_id} is finished with errors.")
             cursor.execute("UPDATE processed_files SET downloaded=4 WHERE id=?", (record_id,))
             conn.commit()
+
     conn.close()
 
 

psr/factory/__init__.py

@@ -2,6 +2,6 @@
 # Unauthorized copying of this file, via any medium is strictly prohibited
 # Proprietary and confidential
 
-__version__ = "5.0.0b14"
+__version__ = "5.0.0b16"
 
 from .api import *

psr/factory/api.py

@@ -2264,6 +2264,29 @@ class DataFrame(_BaseObject):
         return df_builder.build_polars_dataframe(use_object_dtype=False)
 
 
+    def get(self, expression: str) -> Union[int, float, dt.datetime, str, "DataObject", list, None]:
+        value = Value()
+        _err = Error()
+        factorylib.lib.psrd_table_get_property(self._hdr,
+                                               _c_str(expression),
+                                               value.handler(),
+                                               _err.handler())
+        if _err.code != 0:
+            raise FactoryException(_err.what)
+        return value.get()
+
+    def set(self, expression: str, value):
+        _err = Error()
+        _val = Value()
+        _val.set(value)
+        factorylib.lib.psrd_table_set_property(self._hdr, _c_str(expression),
+                                               _bytes(expression),
+                                               _val.handler(),
+                                               _err.handler())
+        if _err.code != 0:
+            raise FactoryException(_err.what)
+
+
 def load_dataframe(input_file: Union[str, pathlib.Path], **kwargs) -> DataFrame:
     options = kwargs.get("options", None)
     return DataFrame.load_from_file(input_file, options)