inferencesh 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

inferencesh/sdk.py

@@ -140,17 +140,29 @@ class File(BaseModel):
         return self
 
     def model_post_init(self, _: Any) -> None:
-        if self.uri and self._is_url(self.uri):
-            self._download_url()
-        elif self.uri and not os.path.isabs(self.uri):
-            self.path = os.path.abspath(self.uri)
-        elif self.uri:
-            self.path = self.uri
+        """Initialize file path and metadata after model creation.
+        
+        This method handles:
+        1. Downloading URLs to local files if uri is a URL
+        2. Converting relative paths to absolute paths
+        3. Populating file metadata
+        """
+        # Handle uri if provided
+        if self.uri:
+            if self._is_url(self.uri):
+                self._download_url()
+            else:
+                # Convert relative paths to absolute, leave absolute paths unchanged
+                self.path = os.path.abspath(self.uri)
+        
+        # Handle path if provided
         if self.path:
+            # Convert relative paths to absolute, leave absolute paths unchanged
+            self.path = os.path.abspath(self.path)
             self._populate_metadata()
-        else:
-            raise ValueError("Either 'uri' or 'path' must be provided")
-    
+            return
+            
+        raise ValueError("Either 'uri' or 'path' must be provided and be valid")
     def _is_url(self, path: str) -> bool:
         """Check if the path is a URL."""
         parsed = urllib.parse.urlparse(path)
@@ -252,6 +264,18 @@ class File(BaseModel):
             self.size = self._get_file_size()  # Always update size
             self.filename = self._get_filename()
 
+    @classmethod
+    def model_json_schema(cls, **kwargs):
+        schema = super().model_json_schema(**kwargs)
+        
+        # Create a schema that accepts either a string or the full object
+        return {
+            "oneOf": [
+                {"type": "string"},  # Accept string input
+                schema  # Accept full object input
+            ]
+        }
+
 
 class ContextMessageRole(str, Enum):
     USER = "user"
@@ -326,19 +350,26 @@ class LLMInputWithImage(LLMInput):
         default=None
     )
 
-class DownloadDir(str, Enum):
-    """Standard download directories used by the SDK."""
-    DATA = "./data"   # Persistent storage/cache directory
-    TEMP = "./tmp"    # Temporary storage directory
-    CACHE = "./cache" # Cache directory
+class StorageDir(str, Enum):
+    """Standard storage directories used by the SDK."""
+    DATA = "/app/data"   # Persistent storage/cache directory
+    TEMP = "/app/tmp"    # Temporary storage directory
+    CACHE = "/app/cache" # Cache directory
+
+    @property
+    def path(self) -> Path:
+        """Get the Path object for this storage directory, ensuring it exists."""
+        path = Path(self.value)
+        path.mkdir(parents=True, exist_ok=True)
+        return path
 
-def download(url: str, directory: Union[str, Path, DownloadDir]) -> str:
+def download(url: str, directory: Union[str, Path, StorageDir]) -> str:
     """Download a file to the specified directory and return its path.
     
     Args:
         url: The URL to download from
         directory: The directory to save the file to. Can be a string path, 
-                  Path object, or DownloadDir enum value.
+                  Path object, or StorageDir enum value.
         
     Returns:
         str: The path to the downloaded file
@@ -360,7 +391,7 @@ def download(url: str, directory: Union[str, Path, DownloadDir]) -> str:
     output_path = hash_dir / filename
     
     # If file exists in directory and it's not a temp directory, return it
-    if output_path.exists() and directory != DownloadDir.TEMP:
+    if output_path.exists() and directory != StorageDir.TEMP:
         return str(output_path)
     
     # Download the file

{inferencesh-0.2.3.dist-info → inferencesh-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: inferencesh
-Version: 0.2.3
+Version: 0.2.5
 Summary: inference.sh Python SDK
 Author: Inference Shell Inc.
 Author-email: "Inference Shell Inc." <hello@inference.sh>

inferencesh-0.2.5.dist-info/RECORD

@@ -0,0 +1,8 @@
+inferencesh/__init__.py,sha256=hbKkgHCh0lCdhWyHs3FHHRd8JfLeHkTd1bT4v79Fi8M,192
+inferencesh/sdk.py,sha256=f_M4_-sKqYIg1kFiBjlI9-1nPNIw6DgLOdRo_9HaOzU,16202
+inferencesh-0.2.5.dist-info/licenses/LICENSE,sha256=OsgqEWIh2el_QMj0y8O1A5Q5Dl-dxqqYbFE6fszuR4s,1086
+inferencesh-0.2.5.dist-info/METADATA,sha256=65IzfW7RGpTXrJevMcZo0w5xXnb9eYK4xEkd2uV3Yms,2756
+inferencesh-0.2.5.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+inferencesh-0.2.5.dist-info/entry_points.txt,sha256=6IC-fyozAqW3ljsMLGCXxJ0_ui2Jb-2fLHtoH1RTnEE,45
+inferencesh-0.2.5.dist-info/top_level.txt,sha256=TSMHg3T1ThMl1HGAWmzBClwOYH1ump5neof9BfHIwaA,12
+inferencesh-0.2.5.dist-info/RECORD,,

{inferencesh-0.2.3.dist-info → inferencesh-0.2.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

inferencesh-0.2.3.dist-info/RECORD

@@ -1,8 +0,0 @@
-inferencesh/__init__.py,sha256=hbKkgHCh0lCdhWyHs3FHHRd8JfLeHkTd1bT4v79Fi8M,192
-inferencesh/sdk.py,sha256=KiD11omxGg0sbCiLSjyJnD1UvfWkUGyk9wB-3wIUcJU,15094
-inferencesh-0.2.3.dist-info/licenses/LICENSE,sha256=OsgqEWIh2el_QMj0y8O1A5Q5Dl-dxqqYbFE6fszuR4s,1086
-inferencesh-0.2.3.dist-info/METADATA,sha256=fLpjiyruNqbj9c9pIszbOpcwEAdK0tOATZCNfQvpIGE,2756
-inferencesh-0.2.3.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-inferencesh-0.2.3.dist-info/entry_points.txt,sha256=6IC-fyozAqW3ljsMLGCXxJ0_ui2Jb-2fLHtoH1RTnEE,45
-inferencesh-0.2.3.dist-info/top_level.txt,sha256=TSMHg3T1ThMl1HGAWmzBClwOYH1ump5neof9BfHIwaA,12
-inferencesh-0.2.3.dist-info/RECORD,,