sapiopycommons 2025.8.12a697__py3-none-any.whl → 2025.8.12a699__py3-none-any.whl

sapiopycommons/ai/converter_service_base.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import traceback
 from abc import ABC, abstractmethod
 
 from grpc import ServicerContext
@@ -22,7 +23,9 @@ class ConverterServiceBase(ConverterServiceServicer, ABC):
                     output_content_type=converter.output_type_pbo()
                 ))
             return ConverterDetailsResponsePbo(supported_types=supported_types)
-        except Exception:
+        except Exception as e:
+            print(f"CRITICAL ERROR: {e}")
+            print(traceback.format_exc())
             return ConverterDetailsResponsePbo()
 
     def ConvertContent(self, request: ConvertRequestPbo, context: ServicerContext) -> ConvertResponsePbo:
@@ -33,9 +36,12 @@ class ConverterServiceBase(ConverterServiceServicer, ABC):
             for c in self.register_converters():
                 converter = c()
                 if converter.can_convert(input_type, target_type):
-                    return ConvertResponsePbo(converter.convert(input_container))
-            raise ValueError(f"No converter found for converting {input_type} to {target_type}.")
-        except Exception:
+                    return ConvertResponsePbo(item_container=converter.convert(input_container))
+            raise ValueError(f"No converter found for converting {input_type.name} ({', '.join(input_type.extensions)}) "
+                             f"to {target_type.name} ({', '.join(target_type.extensions)}).")
+        except Exception as e:
+            print(f"CRITICAL ERROR: {e}")
+            print(traceback.format_exc())
             return ConvertResponsePbo()
 
     @abstractmethod
@@ -97,8 +103,7 @@ class ConverterBase(ABC):
         :param target_type: The target content type.
         :return: True if this converter can convert from the input type to the target type, False otherwise.
         """
-        return (content_types_match(self.input_type_pbo(), input_type) and
-                content_types_match(self.output_type_pbo(), target_type))
+        return self.input_type() == input_type.name and self.output_type() == target_type.name
 
     @abstractmethod
     def convert(self, content: StepItemContainerPbo) -> StepItemContainerPbo:
@@ -109,18 +114,3 @@ class ConverterBase(ABC):
         :return: The converted content.
         """
         pass
-
-
-def content_types_match(a: ContentTypePbo, b: ContentTypePbo) -> bool:
-    """
-    Check if two ContentTypePbo objects match by comparing their names and file extensions.
-
-    :param a: The first ContentTypePbo to compare.
-    :param b: The second ContentTypePbo to compare.
-    :return: True if the content types match, False otherwise.
-    """
-    if a.name != b.name:
-        return False
-    if set(a.extensions) != set(b.extensions):
-        return False
-    return True

sapiopycommons/ai/test_client.py

@@ -100,17 +100,21 @@ class TestClient:
     A client for testing a ToolService.
     """
     grpc_server_url: str
+    options: list[tuple[str, Any]] | None
     connection: SapioConnectionInfoPbo
     _request_inputs: list[StepItemContainerPbo]
     _config_fields: dict[str, Any]
 
-    def __init__(self, grpc_server_url: str, user: SapioUser | None = None):
+    def __init__(self, grpc_server_url: str, user: SapioUser | None = None,
+                 options: list[tuple[str, Any]] | None = None):
         """
         :param grpc_server_url: The URL of the gRPC server to connect to.
         :param user: Optional SapioUser object to use for the connection. If not provided, a default connection
             will be created with test credentials.
+        :param options: Optional list of gRPC channel options.
         """
         self.grpc_server_url = grpc_server_url
+        self.options = options
         self._create_connection(user)
         self._request_inputs = []
         self._config_fields = {}
@@ -224,7 +228,7 @@ class TestClient:
 
         :return: A ToolDetailsResponsePbo object containing the details of the tool service.
         """
-        with grpc.insecure_channel(self.grpc_server_url) as channel:
+        with grpc.insecure_channel(self.grpc_server_url, options=self.options) as channel:
             stub = ToolServiceStub(channel)
             return stub.GetToolDetails(ToolDetailsRequestPbo(sapio_conn_info=self.connection))
 
@@ -237,7 +241,7 @@ class TestClient:
         :param is_dry_run: If True, the tool will not be executed, but the request will be validated.
         :return: A ToolOutput object containing the results of the tool service call.
         """
-        with grpc.insecure_channel(self.grpc_server_url) as channel:
+        with grpc.insecure_channel(self.grpc_server_url, options=self.options) as channel:
             stub = ToolServiceStub(channel)
 
             response: ProcessStepResponsePbo = stub.ProcessData(
@@ -291,12 +295,15 @@ class TestConverterClient:
     A client for testing a ConverterService.
     """
     grpc_server_url: str
+    options: list[tuple[str, Any]] | None
 
-    def __init__(self, grpc_server_url: str):
+    def __init__(self, grpc_server_url: str, options: list[tuple[str, Any]] | None = None):
         """
         :param grpc_server_url: The URL of the gRPC server to connect to.
+        :param options: Optional list of gRPC channel options.
         """
         self.grpc_server_url = grpc_server_url
+        self.options = options
 
     def get_converter_details(self) -> ConverterDetailsResponsePbo:
         """
@@ -304,7 +311,7 @@ class TestConverterClient:
 
         :return: A ToolDetailsResponsePbo object containing the details of the converter service.
         """
-        with grpc.insecure_channel(self.grpc_server_url) as channel:
+        with grpc.insecure_channel(self.grpc_server_url, options=self.options) as channel:
             stub = ConverterServiceStub(channel)
             return stub.GetConverterDetails(ConverterDetailsRequestPbo())
 
@@ -319,7 +326,7 @@ class TestConverterClient:
             converter service supports.
         :return: A StepItemContainerPbo object containing the converted content.
         """
-        with grpc.insecure_channel(self.grpc_server_url) as channel:
+        with grpc.insecure_channel(self.grpc_server_url, options=self.options) as channel:
             stub = ConverterServiceStub(channel)
             response: ConvertResponsePbo = stub.ConvertContent(
                 ConvertRequestPbo(item_container=input_container, target_content_type=target_type)

sapiopycommons/ai/tool_service_base.py

@@ -205,9 +205,11 @@ class ToolServiceBase(ToolServiceServicer, ABC):
             if not details:
                 raise Exception("No tools registered with this service.")
             return ToolDetailsResponsePbo(tool_framework_version=self.tool_version(), tool_details=details)
-        except Exception:
+        except Exception as e:
             # Woe to you if you somehow cause an exception to be raised when just initializing your tools.
             # There's no way to log this.
+            print(f"CRITICAL ERROR: {e}")
+            print(traceback.format_exc())
             return ToolDetailsResponsePbo()
 
     def ProcessData(self, request: ProcessStepRequestPbo, context: ServicerContext) -> ProcessStepResponsePbo:
@@ -232,6 +234,8 @@ class ToolServiceBase(ToolServiceServicer, ABC):
         except Exception as e:
             # This try/except should never be needed, as the tool should handle its own exceptions, but better safe
             # than sorry.
+            print(f"CRITICAL ERROR: {e}")
+            print(traceback.format_exc())
             return ProcessStepResponsePbo(status=ProcessStepResponseStatusPbo.FAILURE,
                                           status_message=f"CRITICAL ERROR: {e}",
                                           log=[traceback.format_exc()])

{sapiopycommons-2025.8.12a697.dist-info → sapiopycommons-2025.8.12a699.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sapiopycommons
-Version: 2025.8.12a697
+Version: 2025.8.12a699
 Summary: Official Sapio Python API Utilities Package
 Project-URL: Homepage, https://github.com/sapiosciences
 Author-email: Jonathan Steck <jsteck@sapiosciences.com>, Yechen Qiao <yqiao@sapiosciences.com>

{sapiopycommons-2025.8.12a697.dist-info → sapiopycommons-2025.8.12a699.dist-info}/RECORD

@@ -1,9 +1,9 @@
 sapiopycommons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sapiopycommons/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sapiopycommons/ai/converter_service_base.py,sha256=TVfgzrNa0DqCTD3rVDJDlOSP9EpIPhkSMi_LdMNfq14,4824
+sapiopycommons/ai/converter_service_base.py,sha256=w4_PXjlk7_F5AUMlPUhKJ9gZlxY9RNG6yH9cDDFROuo,4620
 sapiopycommons/ai/protobuf_utils.py,sha256=AZnZDshismfAzdSewqG0lwvSoEM2tjXBmJkVq22075Q,23831
-sapiopycommons/ai/test_client.py,sha256=Z7hYHKLRJOWlW1e3XOLDH-Df2BfToEpMmUKvCi_YcEM,13680
-sapiopycommons/ai/tool_service_base.py,sha256=OGp57Xe3fcJLp6gFfPMk7YZTU-FQXoKCfWTo8YVUOaY,43300
+sapiopycommons/ai/test_client.py,sha256=ALV_od1ej7tmgKFbFNsFaCrb6ssSZ2kB33JDfLhVchU,14149
+sapiopycommons/ai/tool_service_base.py,sha256=LkmX_kQyHAQtR02S8x6hKc0DnR7mmNNcykBrn87sVVw,43473
 sapiopycommons/ai/api/fielddefinitions/proto/fields_pb2.py,sha256=YcZjb_YM-XeLErM8hEC_S7vGMVGvcXAMGs2b-u5zvOE,2377
 sapiopycommons/ai/api/fielddefinitions/proto/fields_pb2.pyi,sha256=FwtXmNAf7iYGEFm4kbqb04v77jNHbZg18ZmEDhle_bU,1444
 sapiopycommons/ai/api/fielddefinitions/proto/fields_pb2_grpc.py,sha256=wPImJPdCUZNVEVoUWzsba9kGIXjEKPdUkawP5SnVyiU,932
@@ -97,7 +97,7 @@ sapiopycommons/webhook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 sapiopycommons/webhook/webhook_context.py,sha256=D793uLsb1691SalaPnBUk3rOSxn_hYLhdvkaIxjNXss,1909
 sapiopycommons/webhook/webhook_handlers.py,sha256=7o_wXOruhT9auNh8OfhJAh4WhhiPKij67FMBSpGPICc,39939
 sapiopycommons/webhook/webservice_handlers.py,sha256=cvW6Mk_110BzYqkbk63Kg7jWrltBCDALOlkJRu8h4VQ,14300
-sapiopycommons-2025.8.12a697.dist-info/METADATA,sha256=fDoZUmPt0glzITz_USO_dccEdIpxcxswROIl3ldFpxA,3143
-sapiopycommons-2025.8.12a697.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-sapiopycommons-2025.8.12a697.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-sapiopycommons-2025.8.12a697.dist-info/RECORD,,
+sapiopycommons-2025.8.12a699.dist-info/METADATA,sha256=NfsKnuKXPbnwtm2tE9QP4aYEQJ-RHDL75VHZsimjTV8,3143
+sapiopycommons-2025.8.12a699.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+sapiopycommons-2025.8.12a699.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+sapiopycommons-2025.8.12a699.dist-info/RECORD,,