sapiopycommons 2025.8.20a713__tar.gz → 2025.8.22a715__tar.gz

{sapiopycommons-2025.8.20a713 → sapiopycommons-2025.8.22a715}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sapiopycommons
-Version: 2025.8.20a713
+Version: 2025.8.22a715
 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.20a713 → sapiopycommons-2025.8.22a715}/pyproject.toml

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

{sapiopycommons-2025.8.20a713 → sapiopycommons-2025.8.22a715}/src/sapiopycommons/ai/test_client.py

@@ -43,10 +43,10 @@ class ToolOutput:
     status: str
     message: str
 
-    binary_output: list[bytes]
-    csv_output: list[dict[str, Any]]
-    json_output: list[Any]
-    text_output: list[str]
+    binary_output: list[list[bytes]]
+    csv_output: list[list[dict[str, Any]]]
+    json_output: list[list[Any]]
+    text_output: list[list[str]]
 
     new_records: list[dict[str, FieldValue]]
 
@@ -67,24 +67,35 @@ class ToolOutput:
         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:
-            ret_val += f"\t{len(binary)} byte(s)\n"
-            ret_val += f"\t{binary[:50]}...\n"
-
-        ret_val += f"CSV Output: {len(self.csv_output)} item(s)\n"
-        if self.csv_output:
-            ret_val += f"\tHeaders: {', '.join(self.csv_output[0].keys())}\n"
-            for i, csv_row in enumerate(self.csv_output):
-                ret_val += f"\t{i}: {', '.join(f'{v}' for k, v in csv_row.items())}\n"
-
-        ret_val += f"JSON Output: {len(self.json_output)} item(s)\n"
-        if self.json_output:
-            ret_val += f"{json.dumps(self.json_output, indent=2)}\n"
-
-        ret_val += f"Text Output: {len(self.text_output)} item(s)\n"
-        for text in self.text_output:
-            ret_val += f"\t{text}\n"
+        ret_val += f"Binary Output: {sum(len(x) for x in self.binary_output)} item(s) across {len(self.binary_output)} outputs\n"
+        for i, output in enumerate(self.binary_output, start=1):
+            output: list[bytes]
+            ret_val += f"\tBinary Output {i}:\n"
+            for binary in output:
+                ret_val += f"\t\t{len(binary)} byte(s): {binary[:50]}...\n"
+
+        ret_val += f"CSV Output: {sum(len(x) for x in self.csv_output)} item(s) across {len(self.csv_output)} outputs\n"
+        for i, output in enumerate(self.csv_output, start=1):
+            output: list[dict[str, Any]]
+            ret_val += f"\tCSV Output {i}:\n"
+            ret_val += f"\t\tHeaders: {', '.join(output[0].keys())}\n"
+            for j, csv_row in enumerate(output):
+                ret_val += f"\t\t{j}: {', '.join(f'{v}' for k, v in csv_row.items())}\n"
+
+        ret_val += f"JSON Output: {sum(len(x) for x in self.json_output)} item(s) across {len(self.json_output)} outputs\n"
+        for i, output in enumerate(self.json_output, start=1):
+            output: list[Any]
+            ret_val += f"\tJSON Output {i}:\n"
+            for json_obj in output:
+                ret_val += f"\t\t"
+                ret_val += json.dumps(json_obj, indent=2).replace("\n", "\n\t\t") + "\n"
+
+        ret_val += f"Text Output: {sum(len(x) for x in self.text_output)} item(s) across {len(self.text_output)} outputs\n"
+        for i, output in enumerate(self.text_output, start=1):
+            output: list[str]
+            ret_val += f"\tText Output {i}:\n"
+            for text in output:
+                ret_val += f"\t\t{text}\n"
 
         ret_val += f"New Records: {len(self.new_records)} item(s)\n"
         for record in self.new_records:
@@ -277,14 +288,20 @@ class TestClient:
             for item in response.output:
                 container = item.item_container
 
-                results.binary_output.extend(container.binary_container.items)
-                for header in container.csv_container.header.cells:
-                    output_row: dict[str, Any] = {}
-                    for i, row in enumerate(container.csv_container.items):
-                        output_row[header] = row.cells[i]
-                    results.csv_output.append(output_row)
-                results.json_output.extend([json.loads(x) for x in container.json_container.items])
-                results.text_output.extend(container.text_container.items)
+                if container.HasField("binary_container"):
+                    results.binary_output.append(list(container.binary_container.items))
+                elif container.HasField("csv_container"):
+                    csv_output: list[dict[str, Any]] = []
+                    for header in container.csv_container.header.cells:
+                        output_row: dict[str, Any] = {}
+                        for i, row in enumerate(container.csv_container.items):
+                            output_row[header] = row.cells[i]
+                        csv_output.append(output_row)
+                    results.csv_output.append(csv_output)
+                elif container.HasField("json_container"):
+                    results.json_output.append([json.loads(x) for x in container.json_container.items])
+                elif container.HasField("text_container"):
+                    results.text_output.append(list(container.text_container.items))
 
             for record in response.new_records:
                 field_map: dict[str, Any] = {x: ProtobufUtils.field_pbo_to_value(y) for x, y in record.fields.items()}