chunkr-ai 0.0.8__tar.gz → 0.0.10__tar.gz

{chunkr_ai-0.0.8/src/chunkr_ai.egg-info → chunkr_ai-0.0.10}/PKG-INFO

@@ -1,20 +1,20 @@
 Metadata-Version: 2.2
 Name: chunkr-ai
-Version: 0.0.8
+Version: 0.0.10
 Summary: Python client for Chunkr: open source document intelligence
 Author-email: Ishaan Kapoor <ishaan@lumina.sh>
 Project-URL: Homepage, https://chunkr.ai
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx>=0.28.1
-Requires-Dist: pillow>=11.1.0
-Requires-Dist: pydantic>=2.10.4
-Requires-Dist: pytest-asyncio>=0.25.2
-Requires-Dist: python-dotenv>=1.0.1
-Requires-Dist: requests>=2.32.3
+Requires-Dist: httpx>=0.25.0
+Requires-Dist: pillow>=10.0.0
+Requires-Dist: pydantic>=2.0.0
+Requires-Dist: pytest-asyncio>=0.21.0
+Requires-Dist: python-dotenv>=0.19.0
+Requires-Dist: requests>=2.28.0
 Provides-Extra: test
-Requires-Dist: pytest>=8.3.4; extra == "test"
-Requires-Dist: pytest-xdist>=3.6.1; extra == "test"
+Requires-Dist: pytest>=7.0.0; extra == "test"
+Requires-Dist: pytest-xdist>=3.0.0; extra == "test"
 
 # Chunkr Python Client
 

{chunkr_ai-0.0.8 → chunkr_ai-0.0.10}/pyproject.toml

@@ -4,24 +4,24 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "chunkr-ai"
-version = "0.0.8"
+version = "0.0.10"
 authors = [{"name" = "Ishaan Kapoor", "email" = "ishaan@lumina.sh"}]
 description = "Python client for Chunkr: open source document intelligence"
 readme = "README.md"
 license = {"file" = "LICENSE"}
 urls = {Homepage = "https://chunkr.ai"} 
 dependencies = [
-    "httpx>=0.28.1",
-    "pillow>=11.1.0",
-    "pydantic>=2.10.4",
-    "pytest-asyncio>=0.25.2",
-    "python-dotenv>=1.0.1",
-    "requests>=2.32.3",
+    "httpx>=0.25.0",
+    "pillow>=10.0.0",
+    "pydantic>=2.0.0",
+    "pytest-asyncio>=0.21.0",
+    "python-dotenv>=0.19.0",
+    "requests>=2.28.0",
 ]
 
 [project.optional-dependencies]
 test = [
-    "pytest>=8.3.4",
-    "pytest-xdist>=3.6.1",
+    "pytest>=7.0.0",
+    "pytest-xdist>=3.0.0",
 ]
 

{chunkr_ai-0.0.8 → chunkr_ai-0.0.10}/src/chunkr_ai/api/chunkr.py

@@ -1,4 +1,4 @@
-from .base import ChunkrBase
+from .chunkr_base import ChunkrBase
 from .config import Configuration
 from .task import TaskResponse
 from pathlib import Path
@@ -163,5 +163,3 @@ class Chunkr(ChunkrBase):
             headers=self._headers()
         )
         r.raise_for_status()
-
-  

{chunkr_ai-0.0.8 → chunkr_ai-0.0.10}/src/chunkr_ai/api/chunkr_async.py

@@ -1,4 +1,4 @@
-from .base import ChunkrBase
+from .chunkr_base import ChunkrBase
 from .task import TaskResponse
 from .config import Configuration
 import httpx

{chunkr_ai-0.0.8 → chunkr_ai-0.0.10}/src/chunkr_ai/api/config.py

@@ -40,7 +40,6 @@ class ChunkProcessing(BaseModel):
 
 class Property(BaseModel):
     name: str
-    title: Optional[str] = None
     prop_type: str
     description: Optional[str] = None
     default: Optional[str] = None

{chunkr_ai-0.0.8 → chunkr_ai-0.0.10}/src/chunkr_ai/api/misc.py

@@ -1,11 +1,11 @@
+from .config import Configuration, Property, JsonSchema
 import io
 import json
 from pathlib import Path
 from PIL import Image
 import requests
 from typing import Union, Tuple, BinaryIO, Optional
-from .config import Configuration
-
+from pydantic import BaseModel
 
 def prepare_file(
     file: Union[str, Path, BinaryIO, Image.Image]
@@ -15,8 +15,31 @@ def prepare_file(
     if isinstance(file, str) and (file.startswith('http://') or file.startswith('https://')):
         response = requests.get(file)
         response.raise_for_status()
+        
+        # Try to get filename from Content-Disposition header first
+        filename = None
+        content_disposition = response.headers.get('Content-Disposition')
+        if content_disposition and 'filename=' in content_disposition:
+            filename = content_disposition.split('filename=')[-1].strip('"\'')
+        
+        # If no Content-Disposition, try to get clean filename from URL path
+        if not filename:
+            from urllib.parse import urlparse, unquote
+            parsed_url = urlparse(file)
+            path = unquote(parsed_url.path)
+            filename = Path(path).name if path else None
+        
+        # Fallback to default name if we couldn't extract one
+        filename = filename or 'downloaded_file'
+        
+        # Sanitize filename: remove invalid characters and limit length
+        import re
+        filename = re.sub(r'[<>:"/\\|?*%]', '_', filename)  # Replace invalid chars with underscore
+        filename = re.sub(r'\s+', '_', filename)            # Replace whitespace with underscore
+        filename = filename.strip('._')                     # Remove leading/trailing dots and underscores
+        filename = filename[:255]                           # Limit length to 255 characters
+        
         file_obj = io.BytesIO(response.content)
-        filename = Path(file.split('/')[-1]).name or 'downloaded_file'
         return filename, file_obj
 
     # Handle base64 strings
@@ -104,3 +127,33 @@ def prepare_upload_data(
             files[key] = (None, json.dumps(value), 'application/json')
                 
     return files
+
+def from_pydantic(pydantic: BaseModel) -> dict:
+    """Convert a Pydantic model to a Chunk json schema.
+    
+    Args:
+        pydantic: A Pydantic BaseModel class or instance
+        
+    Returns:
+        dict: A JSON schema compatible with Chunk's format
+    """
+    model = pydantic if isinstance(pydantic, type) else pydantic.__class__
+    schema = model.model_json_schema()
+    print(schema)
+    properties = []
+    for name, details in schema.get('properties', {}).items():
+        prop = Property(
+            name=name,
+            title=details.get('title'),
+            prop_type=details.get('type', 'string'),
+            description=details.get('description'),
+            default=str(details.get('default')) if details.get('default') is not None else None
+        )
+        properties.append(prop)
+    
+    json_schema = JsonSchema(
+        title=schema.get('title', model.__name__),
+        properties=properties
+    )
+    
+    return json_schema.model_dump(mode="json", exclude_none=True)

chunkr_ai-0.0.10/src/chunkr_ai/api/task_async.py

@@ -0,0 +1,111 @@
+import asyncio
+from pydantic import BaseModel, PrivateAttr
+from datetime import datetime
+from enum import Enum
+from typing import Optional, Union
+from .task_base import TaskBase
+from .protocol import ChunkrClientProtocol
+from .config import Configuration, OutputResponse
+from .misc import prepare_upload_data
+
+class Status(str, Enum):
+    STARTING = "Starting"
+    PROCESSING = "Processing"
+    SUCCEEDED = "Succeeded"
+    FAILED = "Failed"
+    CANCELLED = "Cancelled"
+
+class TaskResponseAsync(BaseModel, TaskBase):
+    configuration: Configuration
+    created_at: datetime
+    expires_at: Optional[datetime]
+    file_name: Optional[str]
+    finished_at: Optional[datetime]
+    input_file_url: Optional[str]
+    message: str
+    output: Optional[OutputResponse]
+    page_count: Optional[int]
+    pdf_url: Optional[str]
+    started_at: Optional[datetime]
+    status: Status
+    task_id: str
+    task_url: Optional[str]
+    _client: Optional[Union[ChunkrClientProtocol]] = PrivateAttr(default=None)
+
+    def with_client(self, client: Union[ChunkrClientProtocol]) -> 'TaskResponseAsync':
+        self._client = client
+        return self
+
+    async def poll(self) -> 'TaskResponseAsync':
+        while True:
+            j = await self._poll_request()
+            updated = TaskResponseAsync(**j).with_client(self._client)
+            self.__dict__.update(updated.__dict__)
+            if res := self._check_status():
+                return res
+            await asyncio.sleep(0.5)
+
+    async def _poll_request(self) -> dict:
+        if not self.task_url:
+            raise ValueError("Task URL not found")
+        while True:
+            try:
+                r = await self._client._client.get(self.task_url, headers=self._client._headers())
+                r.raise_for_status()
+                return r.json()
+            except Exception as e:
+                if self.status == Status.FAILED:
+                    raise ValueError(self.message) from e
+                await asyncio.sleep(0.5)
+
+    def _check_status(self) -> Optional['TaskResponseAsync']:
+        if self.status == Status.FAILED:
+            raise ValueError(f"Task failed: {self.message}")
+        if self.status == Status.CANCELLED:
+            return self
+        if self.status not in [Status.STARTING, Status.PROCESSING]:
+            return self
+        return None
+
+    async def update(self, config: Configuration) -> 'TaskResponseAsync':
+        if not self.task_url:
+            raise ValueError("Task URL not found")
+        f = prepare_upload_data(None, config)
+        r = await self._client._client.patch(self.task_url, files=f, headers=self._client._headers())
+        r.raise_for_status()
+        updated = TaskResponseAsync(**r.json()).with_client(self._client)
+        self.__dict__.update(updated.__dict__)
+        return await self.poll()
+
+    async def cancel(self):
+        if not self.task_url:
+            raise ValueError("Task URL not found")
+        r = await self._client._client.get(f"{self.task_url}/cancel", headers=self._client._headers())
+        r.raise_for_status()
+        return await self.poll()
+
+    async def delete(self):
+        r = await self._client._client.delete(self.task_url, headers=self._client._headers())
+        r.raise_for_status()
+
+    def html(self) -> str:
+        return self._get_content("html")
+
+    def markdown(self) -> str:
+        return self._get_content("markdown")
+
+    def content(self) -> str:
+        return self._get_content("content")
+
+    def _get_content(self, t: str) -> str:
+        if not self.output:
+            return ""
+        parts = []
+        for c in self.output.chunks:
+            for s in c.segments:
+                v = getattr(s, t)
+                if v:
+                    parts.append(v)
+        return "\n".join(parts)
+
+    # Satisfying TaskBase abstract methods with stubs

chunkr_ai-0.0.10/src/chunkr_ai/api/task_base.py

@@ -0,0 +1,31 @@
+from abc import ABC, abstractmethod
+from .config import Configuration
+
+class TaskBase(ABC):
+    @abstractmethod
+    def poll(self):
+        pass
+
+    @abstractmethod
+    def update(self, config: Configuration):
+        pass
+
+    @abstractmethod
+    def cancel(self):
+        pass
+
+    @abstractmethod
+    def delete(self):
+        pass
+
+    @abstractmethod
+    def html(self) -> str:
+        pass
+
+    @abstractmethod
+    def markdown(self) -> str:
+        pass
+
+    @abstractmethod
+    def content(self) -> str:
+        pass

{chunkr_ai-0.0.8 → chunkr_ai-0.0.10/src/chunkr_ai.egg-info}/PKG-INFO

@@ -1,20 +1,20 @@
 Metadata-Version: 2.2
 Name: chunkr-ai
-Version: 0.0.8
+Version: 0.0.10
 Summary: Python client for Chunkr: open source document intelligence
 Author-email: Ishaan Kapoor <ishaan@lumina.sh>
 Project-URL: Homepage, https://chunkr.ai
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: httpx>=0.28.1
-Requires-Dist: pillow>=11.1.0
-Requires-Dist: pydantic>=2.10.4
-Requires-Dist: pytest-asyncio>=0.25.2
-Requires-Dist: python-dotenv>=1.0.1
-Requires-Dist: requests>=2.32.3
+Requires-Dist: httpx>=0.25.0
+Requires-Dist: pillow>=10.0.0
+Requires-Dist: pydantic>=2.0.0
+Requires-Dist: pytest-asyncio>=0.21.0
+Requires-Dist: python-dotenv>=0.19.0
+Requires-Dist: requests>=2.28.0
 Provides-Extra: test
-Requires-Dist: pytest>=8.3.4; extra == "test"
-Requires-Dist: pytest-xdist>=3.6.1; extra == "test"
+Requires-Dist: pytest>=7.0.0; extra == "test"
+Requires-Dist: pytest-xdist>=3.0.0; extra == "test"
 
 # Chunkr Python Client
 

{chunkr_ai-0.0.8 → chunkr_ai-0.0.10}/src/chunkr_ai.egg-info/SOURCES.txt

@@ -10,13 +10,14 @@ src/chunkr_ai.egg-info/dependency_links.txt
 src/chunkr_ai.egg-info/requires.txt
 src/chunkr_ai.egg-info/top_level.txt
 src/chunkr_ai/api/__init__.py
-src/chunkr_ai/api/api.py
 src/chunkr_ai/api/auth.py
-src/chunkr_ai/api/base.py
 src/chunkr_ai/api/chunkr.py
 src/chunkr_ai/api/chunkr_async.py
+src/chunkr_ai/api/chunkr_base.py
 src/chunkr_ai/api/config.py
 src/chunkr_ai/api/misc.py
 src/chunkr_ai/api/protocol.py
 src/chunkr_ai/api/task.py
+src/chunkr_ai/api/task_async.py
+src/chunkr_ai/api/task_base.py
 tests/test_chunkr.py

chunkr_ai-0.0.10/src/chunkr_ai.egg-info/requires.txt

@@ -0,0 +1,10 @@
+httpx>=0.25.0
+pillow>=10.0.0
+pydantic>=2.0.0
+pytest-asyncio>=0.21.0
+python-dotenv>=0.19.0
+requests>=2.28.0
+
+[test]
+pytest>=7.0.0
+pytest-xdist>=3.0.0

{chunkr_ai-0.0.8 → chunkr_ai-0.0.10}/tests/test_chunkr.py

@@ -19,7 +19,7 @@ from chunkr_ai.models import (
 
 @pytest.fixture(params=[
     pytest.param(("sync", Chunkr()), id="sync"),
-    # pytest.param(("async", ChunkrAsync()), id="async")
+    pytest.param(("async", ChunkrAsync()), id="async")
 ])
 def chunkr_client(request):
     return request.param
@@ -206,9 +206,9 @@ async def test_json_schema(chunkr_client, sample_path):
     
     assert isinstance(response, TaskResponse)
     assert response.task_id is not None
-    assert response.status == "Succeeded"
+    if response.status != "Succeeded":
+        raise ValueError(f"Task failed with message: {response.message}")
     assert response.output is not None
-    
 @pytest.mark.asyncio
 async def test_delete_task(chunkr_client, sample_path):
     client_type, client = chunkr_client

chunkr_ai-0.0.8/src/chunkr_ai.egg-info/requires.txt

@@ -1,10 +0,0 @@
-httpx>=0.28.1
-pillow>=11.1.0
-pydantic>=2.10.4
-pytest-asyncio>=0.25.2
-python-dotenv>=1.0.1
-requests>=2.32.3
-
-[test]
-pytest>=8.3.4
-pytest-xdist>=3.6.1