fix file schema

Author: okaris

examples/run.py

@@ -4,25 +4,34 @@
 def run_with_updates() -> None:
     """Example showing how to get streaming updates."""
     api_key = "1nfsh-7yxm9j9mdpkkpsab2dxtnddxft"
-    client = Inference(api_key=api_key, base_url="https://api-dev.inference.sh")
+    client = Inference(api_key=api_key, base_url="https://api.inference.sh")
 
     try:
         # Run with stream=True to get updates
         for update in client.run(
             {
-                "app": "lginf/llm-router",
-                "input": {"image": "https://storage.googleapis.com/folip-api-images/images/rGF6LfQuGQUEox9YF3JkuOiITUm1/dc4c0e18cb7a4f669bc6b6f3b99e6147.png"},
+                "app": "infsh/glm-45-air",
+                "input": {"text": "lolo"},
                 "infra": "cloud",
                 "variant": "default"
             },
             stream=True  # Enable streaming updates
         ):
-            # Print each update as it comes in
+            # Print detailed update info
             status = update.get("status")
             status_name = TaskStatus(status).name if status is not None else "UNKNOWN"
-            print(f"Status: {status_name}")
 
-            # Print output when task completes
+            # Print all available info
+            print("\nUpdate received:")
+            print(f"  Status: {status_name}")
+            if update.get("logs"):
+                print(f"  Logs: {update['logs']}")
+            if update.get("progress"):
+                print(f"  Progress: {update['progress']}")
+            if update.get("metrics"):
+                print(f"  Metrics: {update['metrics']}")
+            
+            # Handle completion states
             if status == TaskStatus.COMPLETED:
                 print("\n✓ Task completed!")
                 print(f"Output: {update.get('output')}")
@@ -45,26 +54,15 @@ def run_simple() -> None:
     client = Inference(api_key=api_key, base_url="https://api-dev.inference.sh")
 
     try:
-        # Simple synchronous run
-        task = client.run(
-            {
-                "app": "lginf/llm-router",
-                "input": {"image": "https://storage.googleapis.com/folip-api-images/images/rGF6LfQuGQUEox9YF3JkuOiITUm1/dc4c0e18cb7a4f669bc6b6f3b99e6147.png"},
-                "infra": "cloud",
-                "variant": "default"
-            }
-        )
+        # Simple synchronous run - waits for completion by default
+        result = client.run({
+            "app": "lginf/llm-router",
+            "input": {"image": "https://storage.googleapis.com/folip-api-images/images/rGF6LfQuGQUEox9YF3JkuOiITUm1/dc4c0e18cb7a4f669bc6b6f3b99e6147.png"},
+            "infra": "cloud",
+            "variant": "default"
+        })
 
-        print(f"Task ID: {task.get('id')}")
-
-        # Print final task
-        if task.get("status") == TaskStatus.COMPLETED:
-            print("\n✓ Task completed successfully!")
-            print(f"Output: {task.get('output')}")
-        else:
-            status = task.get("status")
-            status_name = TaskStatus(status).name if status is not None else "UNKNOWN"
-            print(f"\n✗ Task did not complete. Final status: {status_name}")
+        print(f"Task completed! Output: {result['output']}")
 
     except Exception as exc:  # noqa: BLE001
         print(f"\nError: {type(exc).__name__}: {exc}")

src/inferencesh/client.py

@@ -366,7 +366,8 @@ def run(
             task_id = task["id"]
             
             # Stream updates
-            for update in client.run(params, stream=True):
+            stream = client.run(params, stream=True)
+            for update in stream:
                 print(f"Status: {update.get('status')}")
                 if update.get('status') == TaskStatus.COMPLETED:
                     print(f"Result: {update.get('output')}")
@@ -794,7 +795,8 @@ async def run(
             task_id = task["id"]
             
             # Stream updates
-            async for update in await client.run(params, stream=True):
+            stream = await client.run(params, stream=True)
+            for update in stream:
                 print(f"Status: {update.get('status')}")
                 if update.get('status') == TaskStatus.COMPLETED:
                     print(f"Result: {update.get('output')}")

src/inferencesh/models/file.py

@@ -266,11 +266,15 @@ def __get_pydantic_json_schema__(
     ) -> dict[str, Any]:
         """Generate a simple JSON schema that accepts either a string or an object"""
         json_schema = handler(schema)
-        # Don't resolve refs here - that's what was causing the recursion
+        if "$ref" in json_schema:
+            # If we got a ref, resolve it to the actual schema
+            json_schema = handler.resolve_ref_schema(json_schema)
+        
+        # Add string as an alternative without recursion
         return {
             "$id": "/schemas/File",
             "oneOf": [
-                json_schema,
+                {k: v for k, v in json_schema.items() if k != "$ref"},  # Remove any $ref to prevent recursion
                 {"type": "string"}
             ]
         }

tests/test_sdk.py

@@ -159,4 +159,19 @@ def read(self):
         tmp_path = file._tmp_path
         assert os.path.exists(tmp_path)
         del file
-        assert not os.path.exists(tmp_path) 
+        assert not os.path.exists(tmp_path) 
+        
+def test_file_schema():
+    file = File(uri="https://example.com/test.txt")
+    print(file.model_json_schema())
+    assert file.model_json_schema() is not None
+    assert file.model_json_schema()["$id"] == "/schemas/File"
+    assert file.model_json_schema()["oneOf"] is not None
+    assert file.model_json_schema()["oneOf"][0] is not None
+    assert file.model_json_schema()["oneOf"][0]["type"] == "object"
+    assert file.model_json_schema()["oneOf"][0]["properties"] is not None
+    assert file.model_json_schema()["oneOf"][0]["properties"]["uri"] is not None
+    assert file.model_json_schema()["oneOf"][0]["properties"]["path"] is not None
+    assert file.model_json_schema()["oneOf"][0]["properties"]["content_type"] is not None
+    assert file.model_json_schema()["oneOf"][0]["properties"]["size"] is not None
+    assert file.model_json_schema()["oneOf"][0]["properties"]["filename"] is not None