sapiopycommons 2025.7.22a639__tar.gz → 2025.7.22a651__tar.gz

{sapiopycommons-2025.7.22a639 → sapiopycommons-2025.7.22a651}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sapiopycommons
-Version: 2025.7.22a639
+Version: 2025.7.22a651
 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.7.22a639 → sapiopycommons-2025.7.22a651}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sapiopycommons"
-version='2025.07.22a639'
+version='2025.07.22a651'
 authors = [
     { name="Jonathan Steck", email="jsteck@sapiosciences.com" },
     { name="Yechen Qiao", email="yqiao@sapiosciences.com" },

{sapiopycommons-2025.7.22a639 → sapiopycommons-2025.7.22a651}/src/sapiopycommons/ai/test_client.py

@@ -10,7 +10,7 @@ from sapiopycommons.ai.api.plan.tool.proto.entry_pb2 import DataTypePbo, StepBin
     StepCsvHeaderRowPbo, StepCsvContainerPbo, StepJsonContainerPbo, StepImageContainerPbo, StepTextContainerPbo, \
     StepItemContainerPbo, StepInputBatchPbo
 from sapiopycommons.ai.api.plan.tool.proto.tool_pb2 import ProcessStepResponsePbo, ProcessStepRequestPbo, \
-    ToolDetailsRequestPbo, ToolDetailsResponsePbo
+    ToolDetailsRequestPbo, ToolDetailsResponsePbo, ProcessStepResponseStatusPbo
 from sapiopycommons.ai.api.plan.tool.proto.tool_pb2_grpc import ToolServiceStub
 from sapiopycommons.ai.api.session.proto.sapio_conn_info_pb2 import SapioConnectionInfoPbo, SapioUserSecretTypePbo
 
@@ -23,6 +23,9 @@ class ToolOutput:
     """
     tool_name: str
 
+    status: str
+    message: str
+
     binary_output: list[bytes]
     csv_output: list[dict[str, Any]]
     json_output: list[Any]
@@ -45,6 +48,8 @@ class ToolOutput:
 
     def __str__(self):
         ret_val: str = f"{self.tool_name} Output:\n"
+        ret_val += f"\tStatus: {self.status}\n"
+        ret_val += f"\tMessage: {self.message}\n"
         ret_val += "-" * 25 + "\n"
         ret_val += f"Binary Output: {len(self.binary_output)} item(s)\n"
         for binary in self.binary_output:
@@ -215,12 +220,13 @@ class TestClient:
             stub = ToolServiceStub(channel)
             return stub.GetToolDetails(ToolDetailsRequestPbo(sapio_conn_info=self.connection))
 
-    def call_tool(self, tool_name: str) -> ToolOutput:
+    def call_tool(self, tool_name: str, is_dry_run: bool = False) -> ToolOutput:
         """
         Send the request to the tool service for a particular tool name. This will send all the inputs that have been
         added using the add_X_input functions.
 
         :param tool_name: The name of the tool to call on the server.
+        :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:
@@ -234,11 +240,21 @@ class TestClient:
                     input=[
                         StepInputBatchPbo(is_partial=False, item_container=item)
                         for item in self._request_inputs
-                    ]
+                    ],
+                    dry_run=is_dry_run,
+                    verbose_logging=True
                 )
             )
 
             results = ToolOutput(tool_name)
+            match response.status:
+                case ProcessStepResponseStatusPbo.SUCCESS:
+                    results.status = "Success"
+                case ProcessStepResponseStatusPbo.FAILURE:
+                    results.status = "Failure"
+                case _:
+                    results.status = "Unknown"
+            results.message = response.status_message
             for item in response.output:
                 container = item.item_container
 

{sapiopycommons-2025.7.22a639 → sapiopycommons-2025.7.22a651}/src/sapiopycommons/ai/tool_service_base.py

@@ -252,7 +252,7 @@ class ToolServiceBase(ToolServiceServicer, ABC):
                 secret: str = info.secret
                 if secret.startswith("Basic "):
                     secret = secret[6:]
-                credentials: list[str] = base64.b64decode(secret).decode().split(":")
+                credentials: list[str] = base64.b64decode(secret).decode().split(":", 1)
                 user.username = credentials[0]
                 user.password = credentials[1]
             case _:
@@ -301,7 +301,12 @@ class ToolServiceBase(ToolServiceServicer, ABC):
             # Setup the tool with details from the request.
             tool.setup(user, request, context)
             # Validate that the provided inputs match the tool's expected inputs.
-            msg: str = tool.validate_input()
+            if not request.input:
+                msg: str = "No inputs provided to this tool!"
+            elif len(request.input) != len(tool.inputs):
+                msg: str = f"Expected {len(tool.inputs)} inputs for this tool, but got {len(request.input)} instead."
+            else:
+                msg: str = tool.validate_input()
             # If there is no error message, then the inputs are valid.
             success: bool = not bool(msg)
             # If this is a dry run, then provide the fixed dry run output.

{sapiopycommons-2025.7.22a639 → sapiopycommons-2025.7.22a651}/src/sapiopycommons/webhook/webservice_handlers.py

@@ -140,7 +140,7 @@ class AbstractWebserviceHandler(AbstractWebhookHandler):
         # Get the login credentials from the headers.
         auth: str = headers.get("Authorization")
         if auth and auth.startswith("Basic "):
-            credentials: list[str] = b64decode(auth.split("Basic ")[1]).decode().split(":")
+            credentials: list[str] = b64decode(auth.split("Basic ")[1]).decode().split(":", 1)
             user = self.basic_auth(url, credentials[0], credentials[1])
         elif auth and auth.startswith("Bearer "):
             user = self.bearer_token_auth(url, auth.split("Bearer ")[1])