inferencesh 0.1.24__py3-none-any.whl → 0.2.1__py3-none-any.whl

inferencesh/sdk.py

@@ -1,17 +1,21 @@
 from typing import Optional, Union
-from pydantic import BaseModel, ConfigDict, PrivateAttr, model_validator
+from pydantic import BaseModel, ConfigDict, PrivateAttr, model_validator, Field, field_validator
 import mimetypes
 import os
 import urllib.request
 import urllib.parse
 import tempfile
-from pydantic import Field
 from typing import Any, Dict, List
 
 import inspect
 import ast
 import textwrap
 from collections import OrderedDict
+from enum import Enum
+import shutil
+from pathlib import Path
+import hashlib
+from tqdm import tqdm
 
 
 # inspired by https://github.com/pydantic/pydantic/issues/7580
@@ -102,39 +106,34 @@ class BaseApp(BaseModel):
 
 class File(BaseModel):
     """A class representing a file in the inference.sh ecosystem."""
-    uri: Optional[str] = None  # Original location (URL or file path)
+    uri: Optional[str] = Field(default=None)  # Original location (URL or file path)
     path: Optional[str] = None  # Resolved local file path
     content_type: Optional[str] = None  # MIME type of the file
     size: Optional[int] = None  # File size in bytes
     filename: Optional[str] = None  # Original filename if available
     _tmp_path: Optional[str] = PrivateAttr(default=None)  # Internal storage for temporary file path
     
-    model_config = ConfigDict(
-        arbitrary_types_allowed=True,
-        populate_by_name=True
-    )
-
-    @classmethod
-    def __get_validators__(cls):
-        # First yield the default validators
-        yield cls.validate
-
+    def __init__(self, initializer=None, **data):
+        if initializer is not None:
+            if isinstance(initializer, str):
+                data['uri'] = initializer
+            elif isinstance(initializer, File):
+                data = initializer.model_dump()
+            else:
+                raise ValueError(f'Invalid input for File: {initializer}')
+        super().__init__(**data)
+
+    @model_validator(mode='before')
     @classmethod
-    def validate(cls, value):
-        """Convert string values to File objects."""
-        if isinstance(value, str):
-            # If it's a string, treat it as a uri
-            return cls(uri=value)
-        elif isinstance(value, cls):
-            # If it's already a File instance, return it as is
-            return value
-        elif isinstance(value, dict):
-            # If it's a dict, use normal validation
-            return cls(**value)
-        raise ValueError(f'Invalid input for File: {value}')
-
+    def convert_str_to_file(cls, values):
+        if isinstance(values, str):  # Only accept strings
+            return {"uri": values}
+        elif isinstance(values, dict):
+            return values
+        raise ValueError(f'Invalid input for File: {values}')
+    
     @model_validator(mode='after')
-    def check_uri_or_path(self) -> 'File':
+    def validate_required_fields(self) -> 'File':
         """Validate that either uri or path is provided."""
         if not self.uri and not self.path:
             raise ValueError("Either 'uri' or 'path' must be provided")
@@ -147,7 +146,10 @@ class File(BaseModel):
             self.path = os.path.abspath(self.uri)
         elif self.uri:
             self.path = self.uri
-        self._populate_metadata()
+        if self.path:
+            self._populate_metadata()
+        else:
+            raise ValueError("Either 'uri' or 'path' must be provided")
     
     def _is_url(self, path: str) -> bool:
         """Check if the path is a URL."""
@@ -174,11 +176,22 @@ class File(BaseModel):
             }
             req = urllib.request.Request(original_url, headers=headers)
             
-            # Download the file
+            # Download the file with progress bar
             print(f"Downloading URL: {original_url} to {self._tmp_path}")
             try:
-                with urllib.request.urlopen(req) as response, open(self._tmp_path, 'wb') as out_file:
-                    out_file.write(response.read())
+                with urllib.request.urlopen(req) as response:
+                    total_size = int(response.headers.get('content-length', 0))
+                    block_size = 1024  # 1 Kibibyte
+                    
+                    with tqdm(total=total_size, unit='iB', unit_scale=True) as pbar:
+                        with open(self._tmp_path, 'wb') as out_file:
+                            while True:
+                                buffer = response.read(block_size)
+                                if not buffer:
+                                    break
+                                out_file.write(buffer)
+                                pbar.update(len(buffer))
+                            
                 self.path = self._tmp_path
             except (urllib.error.URLError, urllib.error.HTTPError) as e:
                 raise RuntimeError(f"Failed to download URL {original_url}: {str(e)}")
@@ -234,13 +247,24 @@ class File(BaseModel):
     
     def refresh_metadata(self) -> None:
         """Refresh all metadata from the file."""
-        self._populate_metadata() 
+        if os.path.exists(self.path):
+            self.content_type = self._guess_content_type()
+            self.size = self._get_file_size()  # Always update size
+            self.filename = self._get_filename()
 
 
+class ContextMessageRole(str, Enum):
+    USER = "user"
+    ASSISTANT = "assistant" 
+    SYSTEM = "system"
+
+class Message(BaseModel):
+    role: ContextMessageRole
+    content: str
+
 class ContextMessage(BaseModel):
-    role: str = Field(
+    role: ContextMessageRole = Field(
         description="The role of the message",
-        enum=["user", "assistant", "system"]
     )
     text: str = Field(
         description="The text content of the message"
@@ -300,4 +324,51 @@ class LLMInputWithImage(LLMInput):
     image: Optional[File] = Field(
         description="The image to use for the model",
         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
+
+def download(url: str, directory: Union[str, Path, DownloadDir]) -> 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.
+        
+    Returns:
+        str: The path to the downloaded file
+    """
+    # Convert directory to Path
+    dir_path = Path(directory)
+    dir_path.mkdir(exist_ok=True)
+    
+    # Create hash directory from URL
+    url_hash = hashlib.sha256(url.encode()).hexdigest()[:12]
+    hash_dir = dir_path / url_hash
+    hash_dir.mkdir(exist_ok=True)
+    
+    # Keep original filename
+    filename = os.path.basename(urllib.parse.urlparse(url).path)
+    if not filename:
+        filename = 'download'
+        
+    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:
+        return str(output_path)
+    
+    # Download the file
+    file = File(url)
+    if file.path:
+        shutil.copy2(file.path, output_path)
+        # Prevent the File instance from deleting its temporary file
+        file._tmp_path = None
+        return str(output_path)
+    
+    raise RuntimeError(f"Failed to download {url}")

{inferencesh-0.1.24.dist-info → inferencesh-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: inferencesh
-Version: 0.1.24
+Version: 0.2.1
 Summary: inference.sh Python SDK
 Author: Inference Shell Inc.
 Author-email: "Inference Shell Inc." <hello@inference.sh>
@@ -13,6 +13,10 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pydantic>=2.0.0
+Requires-Dist: tqdm>=4.67.0
+Provides-Extra: test
+Requires-Dist: pytest>=7.0.0; extra == "test"
+Requires-Dist: pytest-cov>=4.0.0; extra == "test"
 Dynamic: author
 Dynamic: license-file
 Dynamic: requires-python

inferencesh-0.2.1.dist-info/RECORD

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

inferencesh-0.1.24.dist-info/RECORD

@@ -1,8 +0,0 @@
-inferencesh/__init__.py,sha256=hbKkgHCh0lCdhWyHs3FHHRd8JfLeHkTd1bT4v79Fi8M,192
-inferencesh/sdk.py,sha256=u8GbIAn5clg_9zHUy99zu2AidgBION4f1KcMJnmjChg,12417
-inferencesh-0.1.24.dist-info/licenses/LICENSE,sha256=OsgqEWIh2el_QMj0y8O1A5Q5Dl-dxqqYbFE6fszuR4s,1086
-inferencesh-0.1.24.dist-info/METADATA,sha256=FM54ThOJtpP14Z1-DN2ZV0Mv0g73md2u8kW15mJfSE4,2612
-inferencesh-0.1.24.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-inferencesh-0.1.24.dist-info/entry_points.txt,sha256=6IC-fyozAqW3ljsMLGCXxJ0_ui2Jb-2fLHtoH1RTnEE,45
-inferencesh-0.1.24.dist-info/top_level.txt,sha256=TSMHg3T1ThMl1HGAWmzBClwOYH1ump5neof9BfHIwaA,12
-inferencesh-0.1.24.dist-info/RECORD,,