chunkr-ai 0.0.36__py3-none-any.whl → 0.0.37__py3-none-any.whl

chunkr_ai/api/chunkr.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from PIL import Image
-from typing import Union, BinaryIO
+from typing import Union, BinaryIO, Optional
 
 from .configuration import Configuration
 from .decorators import anywhere, ensure_client, retry_on_429
@@ -17,8 +17,9 @@ class Chunkr(ChunkrBase):
         self,
         file: Union[str, Path, BinaryIO, Image.Image],
         config: Configuration = None,
+        filename: Optional[str] = None,
     ) -> TaskResponse:
-        task = await self.create_task(file, config)
+        task = await self.create_task(file, config, filename)
         return await task.poll()
 
     @anywhere()
@@ -34,10 +35,12 @@ class Chunkr(ChunkrBase):
         self,
         file: Union[str, Path, BinaryIO, Image.Image],
         config: Configuration = None,
+        filename: Optional[str] = None,
     ) -> TaskResponse:
-        files = await prepare_upload_data(file, config, self._client)
+        """Create a new task with the given file and configuration."""
+        data = await prepare_upload_data(file, filename, config)
         r = await self._client.post(
-            f"{self.url}/api/v1/task", files=files, headers=self._headers()
+            f"{self.url}/api/v1/task/parse", json=data, headers=self._headers()
         )
         r.raise_for_status()
         return TaskResponse(**r.json()).with_client(self, True, False)
@@ -46,10 +49,11 @@ class Chunkr(ChunkrBase):
     @ensure_client()
     @retry_on_429()
     async def update_task(self, task_id: str, config: Configuration) -> TaskResponse:
-        files = await prepare_upload_data(None, config, self._client)
+        """Update an existing task with new configuration."""
+        data = await prepare_upload_data(None, None, config)
         r = await self._client.patch(
-            f"{self.url}/api/v1/task/{task_id}",
-            files=files,
+            f"{self.url}/api/v1/task/{task_id}/parse",
+            json=data,
             headers=self._headers(),
         )
         r.raise_for_status()

chunkr_ai/api/chunkr_base.py

@@ -7,8 +7,7 @@ import httpx
 import os
 from pathlib import Path
 from PIL import Image
-from typing import BinaryIO, Union
-
+from typing import BinaryIO, Union, Optional
 
 class ChunkrBase(HeadersMixin):
     """Base class with shared functionality for Chunkr API clients.
@@ -20,7 +19,7 @@ class ChunkrBase(HeadersMixin):
     """
 
     def __init__(self, url: str = None, api_key: str = None, raise_on_failure: bool = False):
-        load_dotenv()
+        load_dotenv(override=True)
         self.url = url or os.getenv("CHUNKR_URL") or "https://api.chunkr.ai"
         self._api_key = api_key or os.getenv("CHUNKR_API_KEY")
         self.raise_on_failure = raise_on_failure
@@ -38,13 +37,15 @@ class ChunkrBase(HeadersMixin):
         self,
         file: Union[str, Path, BinaryIO, Image.Image],
         config: Configuration = None,
+        filename: Optional[str] = None,
     ) -> TaskResponse:
         """Upload a file and wait for processing to complete.
 
         Args:
             file: The file to upload.
             config: Configuration options for processing. Optional.
-
+            filename: The filename to use for the file. Optional.
+            
         Examples:
         ```python
         # Upload from file path
@@ -58,7 +59,7 @@ class ChunkrBase(HeadersMixin):
         await chunkr.upload("https://example.com/document.pdf")
 
         # Upload from base64 string (must include MIME type header)
-        await chunkr.upload("data:application/pdf;base64,JVBERi0...")
+        await chunkr.upload("data:application/pdf;base64,JVBERi0...", filename="document.pdf")
 
         # Upload an image
         from PIL import Image
@@ -90,13 +91,14 @@ class ChunkrBase(HeadersMixin):
         self,
         file: Union[str, Path, BinaryIO, Image.Image],
         config: Configuration = None,
+        filename: Optional[str] = None,
     ) -> TaskResponse:
         """Upload a file for processing and immediately return the task response. It will not wait for processing to complete. To wait for the full processing to complete, use `task.poll()`.
 
         Args:
             file: The file to upload.
             config: Configuration options for processing. Optional.
-
+            filename: The filename to use for the file. Optional.
         Examples:
         ```
         # Upload from file path
@@ -110,7 +112,7 @@ class ChunkrBase(HeadersMixin):
         task = await chunkr.create_task("https://example.com/document.pdf")
 
         # Upload from base64 string (must include MIME type header)
-        task = await chunkr.create_task("data:application/pdf;base64,JVBERi0xLjcKCjEgMCBvYmo...")
+        task = await chunkr.create_task("data:application/pdf;base64,JVBERi0xLjcKCjEgMCBvYmo...", filename="document.pdf")
 
         # Upload an image
         from PIL import Image

chunkr_ai/api/misc.py

@@ -1,155 +1,103 @@
 from .configuration import Configuration
+import base64
 import io
-import json
 from pathlib import Path
 from PIL import Image
-import httpx
 from typing import Union, Tuple, BinaryIO, Optional
 
-async def prepare_file(file: Union[str, Path, BinaryIO, Image.Image], client: httpx.AsyncClient = None) -> Tuple[str, BinaryIO]:
-    """Convert various file types into a tuple of (filename, file-like object).
+async def prepare_file(file: Union[str, Path, BinaryIO, Image.Image]) -> Tuple[Optional[str], str]:
+    """Convert various file types into a tuple of (filename, file content).
 
-        Args:
-            file: Input file, can be:
-                - String or Path to a file
-                - URL string starting with http:// or https://
-                - Base64 string
-                - Opened binary file (mode='rb')
-                - PIL/Pillow Image object
-
-        Returns:
-            Tuple[str, BinaryIO]: (filename, file-like object) ready for upload
-
-        Raises:
-            FileNotFoundError: If the file path doesn't exist
-            TypeError: If the file type is not supported
-            ValueError: If the URL is invalid or unreachable
-            ValueError: If the MIME type is unsupported
-    """  
-    # Handle URLs
-    if isinstance(file, str) and (
-        file.startswith("http://") or file.startswith("https://")
-    ):
-        if not client:
-            raise ValueError("Client must be provided to download files from URLs")
-        response = await client.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)
-        return filename, file_obj
+    Args:
+        file: Input file, can be:
+            - URL string starting with http:// or https://
+            - Base64 string
+            - Local file path (will be converted to base64)
+            - Opened binary file (will be converted to base64)
+            - PIL/Pillow Image object (will be converted to base64)
 
-    # Handle base64 strings
-    if isinstance(file, str) and "," in file and ";base64," in file:
+    Returns:
+        Tuple[Optional[str], str]: (filename, content) where content is either a URL or base64 string
+        The filename may be None for URLs, base64 strings, and PIL Images
+
+    Raises:
+        FileNotFoundError: If the file path doesn't exist
+        TypeError: If the file type is not supported
+        ValueError: If the URL is invalid or unreachable
+        ValueError: If the MIME type is unsupported
+    """
+    # Handle strings
+    if isinstance(file, str):
+        if file.startswith(('http://', 'https://')):
+            return None, file
         try:
-            # Split header and data
-            header, base64_data = file.split(",", 1)
-            import base64
-
-            file_bytes = base64.b64decode(base64_data)
-            file_obj = io.BytesIO(file_bytes)
-
-            # Try to determine format from header
-            format = "bin"
-            mime_type = header.split(":")[-1].split(";")[0].lower()
-
-            # Map MIME types to file extensions
-            mime_to_ext = {
-                "application/pdf": "pdf",
-                "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "docx",
-                "application/msword": "doc",
-                "application/vnd.openxmlformats-officedocument.presentationml.presentation": "pptx",
-                "application/vnd.ms-powerpoint": "ppt",
-                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
-                "application/vnd.ms-excel": "xls",
-                "image/jpeg": "jpg",
-                "image/png": "png",
-                "image/jpg": "jpg",
-            }
-
-            if mime_type in mime_to_ext:
-                format = mime_to_ext[mime_type]
-            else:
-                raise ValueError(f"Unsupported MIME type: {mime_type}")
-
-            return f"file.{format}", file_obj
-        except Exception as e:
-            raise ValueError(f"Invalid base64 string: {str(e)}")
-
-    # Handle file paths
-    if isinstance(file, (str, Path)):
+            base64.b64decode(file)
+            return None, file
+        except:
+            try:
+                file = Path(file)
+            except:
+                raise ValueError("File must be a valid path, URL, or base64 string")
+
+    # Handle file paths - convert to base64
+    if isinstance(file, Path):
         path = Path(file).resolve()
         if not path.exists():
             raise FileNotFoundError(f"File not found: {file}")
-        return path.name, open(path, "rb")
-
-    # Handle PIL Images
+        
+        with open(path, "rb") as f:
+            file_content = f.read()
+            file_ext = path.suffix.lower().lstrip('.')
+            if not file_ext:
+                raise ValueError("File must have an extension")
+            base64_str = base64.b64encode(file_content).decode()
+            return path.name, base64_str
+
+    # Handle PIL Images - convert to base64
     if isinstance(file, Image.Image):
         img_byte_arr = io.BytesIO()
         format = file.format or "PNG"
         file.save(img_byte_arr, format=format)
         img_byte_arr.seek(0)
-        return f"image.{format.lower()}", img_byte_arr
+        base64_str = base64.b64encode(img_byte_arr.getvalue()).decode()
+        return None, base64_str
 
-    # Handle file-like objects
+    # Handle file-like objects - convert to base64
     if hasattr(file, "read") and hasattr(file, "seek"):
-        # Try to get the filename from the file object if possible
-        name = (
-            getattr(file, "name", "document") if hasattr(file, "name") else "document"
-        )
-        return Path(name).name, file
+        file.seek(0)
+        file_content = file.read()
+        name = getattr(file, "name", "document")
+        file_ext = Path(name).suffix.lower().lstrip('.')
+        if not file_ext:
+            raise ValueError("File must have an extension")
+        base64_str = base64.b64encode(file_content).decode()
+        return Path(name).name, base64_str
 
     raise TypeError(f"Unsupported file type: {type(file)}")
 
 
 async def prepare_upload_data(
     file: Optional[Union[str, Path, BinaryIO, Image.Image]] = None,
+    filename: Optional[str] = None,
     config: Optional[Configuration] = None,
-    client: httpx.AsyncClient = None,
 ) -> dict:
-    """Prepare files and data dictionaries for upload.
+    """Prepare data dictionary for upload.
 
     Args:
         file: The file to upload
         config: Optional configuration settings
+        client: HTTP client for downloading remote files
 
     Returns:
-        dict: (files dict) ready for upload
+        dict: JSON-serializable data dictionary ready for upload
     """
-    files = {}
+    data = {}
     if file:
-        filename, file_obj = await prepare_file(file, client)
-        files = {"file": (filename, file_obj)}
+        processed_filename, processed_file = await prepare_file(file)
+        data["file"] = processed_file
+        data["file_name"] = filename or processed_filename
 
     if config:
-        config_dict = config.model_dump(mode="json", exclude_none=True)
-        for key, value in config_dict.items():
-            files[key] = (None, json.dumps(value), "application/json")
-
-    return files
+        data.update(config.model_dump(mode="json", exclude_none=True))
+        
+    return data

chunkr_ai/api/task_response.py

@@ -74,9 +74,11 @@ class TaskResponse(BaseModel, Generic[T]):
     @retry_on_429()
     async def update(self, config: Configuration) -> T:
         """Update the task configuration."""
-        f = await prepare_upload_data(None, config, self._client._client)
+        data = await prepare_upload_data(None, None, config)
         r = await self._client._client.patch(
-            self.task_url, files=f, headers=self._client._headers()
+            f"{self.task_url}/parse",
+            json=data,
+            headers=self._client._headers()
         )
         r.raise_for_status()
         updated = TaskResponse(**r.json()).with_client(self._client)

{chunkr_ai-0.0.36.dist-info → chunkr_ai-0.0.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: chunkr-ai
-Version: 0.0.36
+Version: 0.0.37
 Summary: Python client for Chunkr: open source document intelligence
 Author-email: Ishaan Kapoor <ishaan@lumina.sh>
 License: MIT License

chunkr_ai-0.0.37.dist-info/RECORD

@@ -0,0 +1,16 @@
+chunkr_ai/__init__.py,sha256=6KpYv2lmD6S5z2kc9pqwuLP5VDHmOuu2qDZArUIhb1s,53
+chunkr_ai/models.py,sha256=tOI7ylkhyeFfCLMisk96EPsH4UEcjBx1Mcisxc_AYXI,757
+chunkr_ai/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+chunkr_ai/api/auth.py,sha256=hlv0GiUmlsbFO1wLL9sslqOnsBSoBqkL_6Mk2SDvxgE,413
+chunkr_ai/api/chunkr.py,sha256=BzwcKNCuLfVR-HzgY8tKStsW4pIDVVjBgnEqPLyUUMM,3292
+chunkr_ai/api/chunkr_base.py,sha256=FDl0Ew8eOY4hur5FFqPENZiq9YQy0G3XWEqcKPeCO-U,6130
+chunkr_ai/api/configuration.py,sha256=2Bfw_c8eQVijb0EvsexiuRbF1pZUspYFBMuZ-ErJHvs,3835
+chunkr_ai/api/decorators.py,sha256=VJX4qGBIL00K2zY8bh5KAMWv7SltJ38TvPJH06FnFss,4415
+chunkr_ai/api/misc.py,sha256=QN-2YWQ8e3VvvK63Ua-e8jsx6gxVxkO88Z96yWOofu0,3653
+chunkr_ai/api/protocol.py,sha256=LjPrYSq52m1afIlAo0yVGXlGZxPRh8J6g7S4PAit3Zo,388
+chunkr_ai/api/task_response.py,sha256=E1H5Cmn9GSYHX60f3Iz8hcTItPv6DpBEEO2vP2vcKDM,6282
+chunkr_ai-0.0.37.dist-info/LICENSE,sha256=w3R12yNDyZpMiy2lxy_hvNbsldC75ww79sF0u11rkho,1069
+chunkr_ai-0.0.37.dist-info/METADATA,sha256=eKMu3F3yYMO2v1i-PAgUKEz1LyU_ManhLOpZqY7RiPo,7031
+chunkr_ai-0.0.37.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+chunkr_ai-0.0.37.dist-info/top_level.txt,sha256=0IZY7PZIiS8bw5r4NUQRUQ-ATi-L_3vLQVq3ZLouOW8,10
+chunkr_ai-0.0.37.dist-info/RECORD,,

chunkr_ai-0.0.36.dist-info/RECORD

@@ -1,16 +0,0 @@
-chunkr_ai/__init__.py,sha256=6KpYv2lmD6S5z2kc9pqwuLP5VDHmOuu2qDZArUIhb1s,53
-chunkr_ai/models.py,sha256=tOI7ylkhyeFfCLMisk96EPsH4UEcjBx1Mcisxc_AYXI,757
-chunkr_ai/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-chunkr_ai/api/auth.py,sha256=hlv0GiUmlsbFO1wLL9sslqOnsBSoBqkL_6Mk2SDvxgE,413
-chunkr_ai/api/chunkr.py,sha256=VnbuAPlWLqyf8xCCU_kpdybgjVPTwZLarDQoD3uozY0,3065
-chunkr_ai/api/chunkr_base.py,sha256=giW56fL7xxJphdOTpIH52dXxpNt7OdP8pNiPSqbNjGM,5835
-chunkr_ai/api/configuration.py,sha256=2Bfw_c8eQVijb0EvsexiuRbF1pZUspYFBMuZ-ErJHvs,3835
-chunkr_ai/api/decorators.py,sha256=VJX4qGBIL00K2zY8bh5KAMWv7SltJ38TvPJH06FnFss,4415
-chunkr_ai/api/misc.py,sha256=gTL8UG_R6bunQdKSXwm_SpyIyTmLprzdX3re_X-mMto,5730
-chunkr_ai/api/protocol.py,sha256=LjPrYSq52m1afIlAo0yVGXlGZxPRh8J6g7S4PAit3Zo,388
-chunkr_ai/api/task_response.py,sha256=FC4OQUv4fltUij5OtFRlWRE9LxzRJGgBhh0olfHJBBg,6258
-chunkr_ai-0.0.36.dist-info/LICENSE,sha256=w3R12yNDyZpMiy2lxy_hvNbsldC75ww79sF0u11rkho,1069
-chunkr_ai-0.0.36.dist-info/METADATA,sha256=1hamwWrDvj0DirX84MAAbZs_yqSxmzGVR7mK7521HK0,7031
-chunkr_ai-0.0.36.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-chunkr_ai-0.0.36.dist-info/top_level.txt,sha256=0IZY7PZIiS8bw5r4NUQRUQ-ATi-L_3vLQVq3ZLouOW8,10
-chunkr_ai-0.0.36.dist-info/RECORD,,