orca-python 0.7.3__tar.gz → 0.7.5__tar.gz

{orca_python-0.7.3 → orca_python-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: orca-python
-Version: 0.7.3
+Version: 0.7.5
 Summary: Python SDK for the Predixus Orca product
 Author: Frederick Mannings
 Author-email: contact@predixus.com
@@ -81,10 +81,10 @@ proc.Start()
 Then run your python file to register it with orca-core:
 
 ```bash
- ORCASERVER=grpc://localhost:32770 HOST=172.18.0.1 python main.py
+ ORCA_CORE=grpc://localhost:32770 PROCESSOR_ADDRESS=172.18.0.1 PROCESSOR_PORT=8080 python main.py
 ```
 
-Replace the contents of `ORCASERVER` and `HOST` with the output of `orca status`.
+Replace the contents of `ORCA_CORE`, `PROCESSOR_ADDRESS` and `PROCESSOR_PORT` with the output of `orca status`.
 
 6. Emit a window to orcacore
    TBD

{orca_python-0.7.3 → orca_python-0.7.5}/README.md

@@ -65,10 +65,10 @@ proc.Start()
 Then run your python file to register it with orca-core:
 
 ```bash
- ORCASERVER=grpc://localhost:32770 HOST=172.18.0.1 python main.py
+ ORCA_CORE=grpc://localhost:32770 PROCESSOR_ADDRESS=172.18.0.1 PROCESSOR_PORT=8080 python main.py
 ```
 
-Replace the contents of `ORCASERVER` and `HOST` with the output of `orca status`.
+Replace the contents of `ORCA_CORE`, `PROCESSOR_ADDRESS` and `PROCESSOR_PORT` with the output of `orca status`.
 
 6. Emit a window to orcacore
    TBD

orca_python-0.7.5/orca_python/envs.py

@@ -0,0 +1,24 @@
+import os
+from typing import Tuple
+
+from orca_python.exceptions import MissingDependency
+
+
+def getenvs() -> Tuple[str, ...]:
+    orcaserver = os.getenv("ORCA_CORE", "")
+    if orcaserver == "":
+        raise MissingDependency("ORCA_CORE is required")
+    orcaserver = orcaserver.lstrip("grpc://")
+
+    port = os.getenv("PROCESSOR_PORT", "")
+    if port == "":
+        raise MissingDependency("PROCESSOR_PORT required")
+
+    host = os.getenv("PROCESSOR_ADDRESS", "")
+    if host == "":
+        raise MissingDependency("PROCESSOR_ADDRESS is required")
+
+    return orcaserver, port, host
+
+
+ORCASERVER, PORT, HOST = getenvs()

{orca_python-0.7.3 → orca_python-0.7.5}/orca_python/main.py

@@ -415,61 +415,37 @@ class Processor(OrcaProcessorServicer):  # type: ignore
 
             algoResult = await loop.run_in_executor(None, algo.exec_fn, params)
 
-            # create result based on the return type
-            current_time = int(time.time())  # Current timestamp in seconds
-
-            if isinstance(algoResult, dict):
-                # for dictionary results, use struct_value
+            # depending on algo result type, map to whatever instance
+            if algo.result_type == StructResult:  # type: ignore
                 struct_value = struct_pb2.Struct()
-                json_format.ParseDict(algoResult, struct_value)
+                json_format.ParseDict(algoResult.value, struct_value)
 
                 resultPb = pb.Result(
-                    status=pb.ResultStatus.RESULT_STATUS_SUCEEDED,  # Note: Using the actual enum from the proto
+                    status=pb.ResultStatus.RESULT_STATUS_SUCEEDED,
                     struct_value=struct_value,
-                    timestamp=current_time,
                 )
-            elif isinstance(algoResult, float) or isinstance(algoResult, int):
+
+            elif algo.result_type == ValueResult:  # type: ignore
                 # for single numeric values
                 resultPb = pb.Result(
                     status=pb.ResultStatus.RESULT_STATUS_SUCEEDED,
-                    single_value=float(algoResult),  # Convert to float as per proto
-                    timestamp=current_time,
+                    single_value=algoResult.value,
                 )
-            elif isinstance(algoResult, list) and all(
-                isinstance(x, (int, float)) for x in algoResult
-            ):
+            elif algo.result_type == ArrayResult:  # type: ignore
                 # for lists of numeric values
                 float_array = pb.FloatArray(values=algoResult)
                 resultPb = pb.Result(
                     status=pb.ResultStatus.RESULT_STATUS_SUCEEDED,
-                    float_values=float_array,
-                    timestamp=current_time,
+                    float_values=float_array.values,
                 )
             else:
-                # try to convert to struct as a fallback
-                try:
-                    struct_value = struct_pb2.Struct()
-                    # convert to dict if possible, otherwise use string representation
-                    if hasattr(algoResult, "__dict__"):
-                        result_dict = algoResult.__dict__
-                    else:
-                        result_dict = {"value": str(algoResult)}
-
-                    json_format.ParseDict(result_dict, struct_value)
-                    resultPb = pb.Result(
-                        status=pb.ResultStatus.RESULT_STATUS_SUCEEDED,
-                        struct_value=struct_value,
-                        timestamp=current_time,
-                    )
-                except Exception as conv_error:
-                    LOGGER.error(
-                        f"Failed to convert result to protobuf: {str(conv_error)}"
-                    )
-                    # create a handled failure result
-                    resultPb = pb.Result(
-                        status=pb.ResultStatus.RESULT_STATUS_HANDLED_FAILED,
-                        timestamp=current_time,
-                    )
+                LOGGER.error(
+                    f"Algorithm {algo.name} {algo.version} has unhandled return type {algo.result_type}"
+                )
+                # create a handled failure result
+                resultPb = pb.Result(
+                    status=pb.ResultStatus.RESULT_STATUS_HANDLED_FAILED,
+                )
 
             # create the algorithm result
             algoResultPb = pb.AlgorithmResult(

{orca_python-0.7.3 → orca_python-0.7.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "orca-python"
-version = "0.7.3"
+version = "0.7.5"
 description = "Python SDK for the Predixus Orca product"
 authors = [
   "Frederick Mannings <contact@predixus.com>"

orca_python-0.7.3/orca_python/envs.py

@@ -1,24 +0,0 @@
-import os
-from typing import Tuple
-
-from orca_python.exceptions import MissingDependency
-
-
-def getenvs() -> Tuple[str, ...]:
-    orcaserver = os.getenv("ORCASERVER", "")
-    if orcaserver == "":
-        MissingDependency("ORCASERVER is required")
-    orcaserver = orcaserver.lstrip("grpc://")
-
-    port = os.getenv("PORT", "")
-    if port == "":
-        MissingDependency("PORT required")
-
-    host = os.getenv("HOST", "")
-    if host == "":
-        MissingDependency("HOST is required")
-
-    return orcaserver, port, host
-
-
-ORCASERVER, PORT, HOST = getenvs()