sapiopycommons 2025.6.30a571__tar.gz → 2025.6.30a572__tar.gz

{sapiopycommons-2025.6.30a571 → sapiopycommons-2025.6.30a572}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sapiopycommons
-Version: 2025.6.30a571
+Version: 2025.6.30a572
 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.6.30a571 → sapiopycommons-2025.6.30a572}/pyproject.toml

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

{sapiopycommons-2025.6.30a571 → sapiopycommons-2025.6.30a572}/src/sapiopycommons/ai/test_client.py

@@ -7,14 +7,15 @@ from sapiopycommons.ai.api.fielddefinitions.proto.fields_pb2 import FieldValuePb
 from sapiopycommons.ai.api.plan.tool.proto.entry_pb2 import DataTypePbo, StepBinaryContainerPbo, StepCsvRowPbo, \
     StepCsvHeaderRowPbo, StepCsvContainerPbo, StepJsonContainerPbo, StepImageContainerPbo, StepTextContainerPbo, \
     StepItemContainerPbo, StepInputBatchPbo
-from sapiopycommons.ai.api.plan.tool.proto.tool_pb2 import ProcessStepResponsePbo, ProcessStepRequestPbo
+from sapiopycommons.ai.api.plan.tool.proto.tool_pb2 import ProcessStepResponsePbo, ProcessStepRequestPbo, \
+    ToolDetailsRequestPbo, ToolDetailsResponsePbo
 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
 
 
-class TestOutput:
+class ToolOutput:
     """
-    A class for holding the output of a TestClient that calls a ToolService. TestOutput objects an be
+    A class for holding the output of a TestClient that calls a ToolService. ToolOutput objects an be
     printed to show the output of the tool in a human-readable format.
     """
     binary_output: list[bytes]
@@ -72,19 +73,16 @@ class TestClient:
     responses.
     """
     server_url: str
-    tool_name: str
     connection: SapioConnectionInfoPbo
-    request_inputs: list[Any]
+    _request_inputs: list[Any]
 
-    def __init__(self, server_url: str, tool_name: str):
+    def __init__(self, server_url: str):
         """
         :param server_url: The URL of the gRPC server to connect to.
-        :param tool_name: The name of the tool to call on the server.
         """
         self.create_user()
         self.server_url = server_url
-        self.tool_name = tool_name
-        self.request_inputs = []
+        self._request_inputs = []
 
     def create_user(self):
         """
@@ -134,6 +132,13 @@ class TestClient:
         """
         self._add_input(DataTypePbo.TEXT, StepTextContainerPbo(items=input_data))
 
+    def clear_inputs(self) -> None:
+        """
+        Clear all inputs that have been added to the next request.
+        This is useful if you want to start a new request without the previous inputs.
+        """
+        self._request_inputs.clear()
+
     def _add_input(self, data_type: DataTypePbo, items: Any) -> None:
         """
         Helper method for adding inputs to the next request.
@@ -151,14 +156,25 @@ class TestClient:
                 container = StepItemContainerPbo(dataType=data_type, text_container=items)
             case _:
                 raise ValueError(f"Unsupported data type: {data_type}")
-        self.request_inputs.append(container)
+        self._request_inputs.append(container)
+
+    def get_service_details(self) -> ToolDetailsResponsePbo:
+        """
+        Get the details of the tools from the server.
 
-    def send_request(self) -> TestOutput:
+        :return: A ToolDetailsResponsePbo object containing the details of the tool service.
         """
-        Send the request to the tool service. This will send all the inputs that have been added using the
-        add_X_input functions.
+        with grpc.insecure_channel(self.server_url) as channel:
+            stub = ToolServiceStub(channel)
+            return stub.GetToolDetails(ToolDetailsRequestPbo(sapio_conn_info=self.connection))
+
+    def call_tool(self, tool_name: str) -> 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.
 
-        :return: A TestOutput object containing the results of the tool service call.
+        :param tool_name: The name of the tool to call on the server.
+        :return: A ToolOutput object containing the results of the tool service call.
         """
         with grpc.insecure_channel(self.server_url) as channel:
             stub = ToolServiceStub(channel)
@@ -166,16 +182,15 @@ class TestClient:
             response: ProcessStepResponsePbo = stub.ProcessData(
                 ProcessStepRequestPbo(
                     sapio_user=self.connection,
-                    tool_name=self.tool_name,
+                    tool_name=tool_name,
                     input=[
                         StepInputBatchPbo(is_partial=False, item_container=item)
-                        for item in self.request_inputs
+                        for item in self._request_inputs
                     ]
                 )
             )
 
-            results = TestOutput()
-
+            results = ToolOutput()
             for item in response.output:
                 container = item.item_container