elaunira-r2index 0.2.0__tar.gz → 0.3.1__tar.gz

{elaunira_r2index-0.2.0 → elaunira_r2index-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elaunira-r2index
-Version: 0.2.0
+Version: 0.3.1
 Summary: Python library for uploading files to R2 and registering them with the r2index API
 Project-URL: Homepage, https://github.com/elaunira/elaunira-r2-index
 Project-URL: Repository, https://github.com/elaunira/elaunira-r2-index
@@ -45,23 +45,20 @@ pip install elaunira-r2index
 ### Sync Client
 
 ```python
-from elaunira.r2index import R2IndexClient, R2Config
+from elaunira.r2index import R2IndexClient
 
 client = R2IndexClient(
-    api_url="https://r2index.example.com",
-    api_token="your-bearer-token",
-    r2_config=R2Config(
-        access_key_id="your-r2-access-key-id",
-        secret_access_key="your-r2-secret-access-key",
-        endpoint_url="https://your-account-id.r2.cloudflarestorage.com",
-        bucket="your-bucket-name",
-    ),
+    index_api_url="https://r2index.example.com",
+    index_api_token="your-bearer-token",
+    r2_access_key_id="your-r2-access-key-id",
+    r2_secret_access_key="your-r2-secret-access-key",
+    r2_endpoint_url="https://your-account-id.r2.cloudflarestorage.com",
 )
 
 # Upload and register a file
-record = client.upload_and_register(
-    local_path="./myfile.zip",
+record = client.upload(
     bucket="my-bucket",
+    local_path="./myfile.zip",
     category="software",
     entity="myapp",
     remote_path="/releases/myapp",
@@ -71,8 +68,8 @@ record = client.upload_and_register(
 )
 
 # Download a file and record the download
-# IP address is auto-detected, user agent defaults to "elaunira-r2index/0.1.0"
-path, record = client.download_and_record(
+# IP address is auto-detected, user agent defaults to "elaunira-r2index/<version>"
+path, record = client.download(
     bucket="my-bucket",
     object_id="/releases/myapp/v1/myapp.zip",
     destination="./downloads/myfile.zip",
@@ -82,22 +79,19 @@ path, record = client.download_and_record(
 ### Async Client
 
 ```python
-from elaunira.r2index import AsyncR2IndexClient, R2Config
+from elaunira.r2index import AsyncR2IndexClient
 
 async with AsyncR2IndexClient(
-    api_url="https://r2index.example.com",
-    api_token="your-bearer-token",
-    r2_config=R2Config(
-        access_key_id="your-r2-access-key-id",
-        secret_access_key="your-r2-secret-access-key",
-        endpoint_url="https://your-account-id.r2.cloudflarestorage.com",
-        bucket="your-bucket-name",
-    ),
+    index_api_url="https://r2index.example.com",
+    index_api_token="your-bearer-token",
+    r2_access_key_id="your-r2-access-key-id",
+    r2_secret_access_key="your-r2-secret-access-key",
+    r2_endpoint_url="https://your-account-id.r2.cloudflarestorage.com",
 ) as client:
     # Upload
-    record = await client.upload_and_register(
-        local_path="./myfile.zip",
+    record = await client.upload(
         bucket="my-bucket",
+        local_path="./myfile.zip",
         category="software",
         entity="myapp",
         remote_path="/releases/myapp",
@@ -107,7 +101,7 @@ async with AsyncR2IndexClient(
     )
 
     # Download
-    path, record = await client.download_and_record(
+    path, record = await client.download(
         bucket="my-bucket",
         object_id="/releases/myapp/v1/myapp.zip",
         destination="./downloads/myfile.zip",
@@ -119,12 +113,14 @@ async with AsyncR2IndexClient(
 Control multipart transfer settings with `R2TransferConfig`:
 
 ```python
-from elaunira.r2index import R2IndexClient, R2Config, R2TransferConfig
+from elaunira.r2index import R2IndexClient, R2TransferConfig
 
 client = R2IndexClient(
-    api_url="https://r2index.example.com",
-    api_token="your-bearer-token",
-    r2_config=R2Config(...),
+    index_api_url="https://r2index.example.com",
+    index_api_token="your-bearer-token",
+    r2_access_key_id="your-r2-access-key-id",
+    r2_secret_access_key="your-r2-secret-access-key",
+    r2_endpoint_url="https://your-account-id.r2.cloudflarestorage.com",
 )
 
 # Custom transfer settings
@@ -135,7 +131,7 @@ transfer_config = R2TransferConfig(
     use_threads=True,                        # Enable threading (default)
 )
 
-path, record = client.download_and_record(
+path, record = client.download(
     bucket="my-bucket",
     object_id="/data/files/v2/largefile.zip",
     destination="./downloads/largefile.zip",
@@ -151,7 +147,7 @@ Default `max_concurrency` is 2x the number of CPU cores (minimum 4).
 def on_progress(bytes_transferred: int) -> None:
     print(f"Downloaded: {bytes_transferred / 1024 / 1024:.1f} MB")
 
-path, record = client.download_and_record(
+path, record = client.download(
     bucket="my-bucket",
     object_id="/releases/myapp/v1/myapp.zip",
     destination="./downloads/myfile.zip",

{elaunira_r2index-0.2.0 → elaunira_r2index-0.3.1}/README.md

@@ -13,23 +13,20 @@ pip install elaunira-r2index
 ### Sync Client
 
 ```python
-from elaunira.r2index import R2IndexClient, R2Config
+from elaunira.r2index import R2IndexClient
 
 client = R2IndexClient(
-    api_url="https://r2index.example.com",
-    api_token="your-bearer-token",
-    r2_config=R2Config(
-        access_key_id="your-r2-access-key-id",
-        secret_access_key="your-r2-secret-access-key",
-        endpoint_url="https://your-account-id.r2.cloudflarestorage.com",
-        bucket="your-bucket-name",
-    ),
+    index_api_url="https://r2index.example.com",
+    index_api_token="your-bearer-token",
+    r2_access_key_id="your-r2-access-key-id",
+    r2_secret_access_key="your-r2-secret-access-key",
+    r2_endpoint_url="https://your-account-id.r2.cloudflarestorage.com",
 )
 
 # Upload and register a file
-record = client.upload_and_register(
-    local_path="./myfile.zip",
+record = client.upload(
     bucket="my-bucket",
+    local_path="./myfile.zip",
     category="software",
     entity="myapp",
     remote_path="/releases/myapp",
@@ -39,8 +36,8 @@ record = client.upload_and_register(
 )
 
 # Download a file and record the download
-# IP address is auto-detected, user agent defaults to "elaunira-r2index/0.1.0"
-path, record = client.download_and_record(
+# IP address is auto-detected, user agent defaults to "elaunira-r2index/<version>"
+path, record = client.download(
     bucket="my-bucket",
     object_id="/releases/myapp/v1/myapp.zip",
     destination="./downloads/myfile.zip",
@@ -50,22 +47,19 @@ path, record = client.download_and_record(
 ### Async Client
 
 ```python
-from elaunira.r2index import AsyncR2IndexClient, R2Config
+from elaunira.r2index import AsyncR2IndexClient
 
 async with AsyncR2IndexClient(
-    api_url="https://r2index.example.com",
-    api_token="your-bearer-token",
-    r2_config=R2Config(
-        access_key_id="your-r2-access-key-id",
-        secret_access_key="your-r2-secret-access-key",
-        endpoint_url="https://your-account-id.r2.cloudflarestorage.com",
-        bucket="your-bucket-name",
-    ),
+    index_api_url="https://r2index.example.com",
+    index_api_token="your-bearer-token",
+    r2_access_key_id="your-r2-access-key-id",
+    r2_secret_access_key="your-r2-secret-access-key",
+    r2_endpoint_url="https://your-account-id.r2.cloudflarestorage.com",
 ) as client:
     # Upload
-    record = await client.upload_and_register(
-        local_path="./myfile.zip",
+    record = await client.upload(
         bucket="my-bucket",
+        local_path="./myfile.zip",
         category="software",
         entity="myapp",
         remote_path="/releases/myapp",
@@ -75,7 +69,7 @@ async with AsyncR2IndexClient(
     )
 
     # Download
-    path, record = await client.download_and_record(
+    path, record = await client.download(
         bucket="my-bucket",
         object_id="/releases/myapp/v1/myapp.zip",
         destination="./downloads/myfile.zip",
@@ -87,12 +81,14 @@ async with AsyncR2IndexClient(
 Control multipart transfer settings with `R2TransferConfig`:
 
 ```python
-from elaunira.r2index import R2IndexClient, R2Config, R2TransferConfig
+from elaunira.r2index import R2IndexClient, R2TransferConfig
 
 client = R2IndexClient(
-    api_url="https://r2index.example.com",
-    api_token="your-bearer-token",
-    r2_config=R2Config(...),
+    index_api_url="https://r2index.example.com",
+    index_api_token="your-bearer-token",
+    r2_access_key_id="your-r2-access-key-id",
+    r2_secret_access_key="your-r2-secret-access-key",
+    r2_endpoint_url="https://your-account-id.r2.cloudflarestorage.com",
 )
 
 # Custom transfer settings
@@ -103,7 +99,7 @@ transfer_config = R2TransferConfig(
     use_threads=True,                        # Enable threading (default)
 )
 
-path, record = client.download_and_record(
+path, record = client.download(
     bucket="my-bucket",
     object_id="/data/files/v2/largefile.zip",
     destination="./downloads/largefile.zip",
@@ -119,7 +115,7 @@ Default `max_concurrency` is 2x the number of CPU cores (minimum 4).
 def on_progress(bytes_transferred: int) -> None:
     print(f"Downloaded: {bytes_transferred / 1024 / 1024:.1f} MB")
 
-path, record = client.download_and_record(
+path, record = client.download(
     bucket="my-bucket",
     object_id="/releases/myapp/v1/myapp.zip",
     destination="./downloads/myfile.zip",

{elaunira_r2index-0.2.0 → elaunira_r2index-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "elaunira-r2index"
-version = "0.2.0"
+version = "0.3.1"
 description = "Python library for uploading files to R2 and registering them with the r2index API"
 readme = "README.md"
 license = "MIT"

{elaunira_r2index-0.2.0 → elaunira_r2index-0.3.1}/src/elaunira/r2index/async_client.py

@@ -81,29 +81,42 @@ class AsyncR2IndexClient:
 
     def __init__(
         self,
-        api_url: str,
-        api_token: str,
-        r2_config: R2Config | None = None,
+        index_api_url: str,
+        index_api_token: str,
+        r2_access_key_id: str | None = None,
+        r2_secret_access_key: str | None = None,
+        r2_endpoint_url: str | None = None,
         timeout: float = 30.0,
     ) -> None:
         """
         Initialize the async R2Index client.
 
         Args:
-            api_url: Base URL of the r2index API.
-            api_token: Bearer token for authentication.
-            r2_config: Optional R2 configuration for upload operations.
+            index_api_url: Base URL of the r2index API.
+            index_api_token: Bearer token for authentication.
+            r2_access_key_id: R2 access key ID for storage operations.
+            r2_secret_access_key: R2 secret access key for storage operations.
+            r2_endpoint_url: R2 endpoint URL for storage operations.
             timeout: Request timeout in seconds.
         """
-        self.api_url = api_url.rstrip("/")
-        self._token = api_token
+        self.api_url = index_api_url.rstrip("/")
+        self._token = index_api_token
         self._timeout = timeout
-        self._r2_config = r2_config
         self._storage: AsyncR2Storage | None = None
 
+        # Build R2 config if credentials provided
+        if r2_access_key_id and r2_secret_access_key and r2_endpoint_url:
+            self._r2_config: R2Config | None = R2Config(
+                access_key_id=r2_access_key_id,
+                secret_access_key=r2_secret_access_key,
+                endpoint_url=r2_endpoint_url,
+            )
+        else:
+            self._r2_config = None
+
         self._client = httpx.AsyncClient(
             base_url=self.api_url,
-            headers={"Authorization": f"Bearer {api_token}"},
+            headers={"Authorization": f"Bearer {index_api_token}"},
             timeout=timeout,
         )
 
@@ -150,7 +163,7 @@ class AsyncR2IndexClient:
 
     # File Operations
 
-    async def list_files(
+    async def list(
         self,
         bucket: str | None = None,
         category: str | None = None,
@@ -191,7 +204,7 @@ class AsyncR2IndexClient:
         data = self._handle_response(response)
         return FileListResponse.model_validate(data)
 
-    async def create_file(self, data: FileCreateRequest) -> FileRecord:
+    async def create(self, data: FileCreateRequest) -> FileRecord:
         """
         Create or upsert a file record.
 
@@ -205,7 +218,7 @@ class AsyncR2IndexClient:
         result = self._handle_response(response)
         return FileRecord.model_validate(result)
 
-    async def get_file(self, file_id: str) -> FileRecord:
+    async def get(self, file_id: str) -> FileRecord:
         """
         Get a file by ID.
 
@@ -222,7 +235,7 @@ class AsyncR2IndexClient:
         data = self._handle_response(response)
         return FileRecord.model_validate(data)
 
-    async def update_file(self, file_id: str, data: FileUpdateRequest) -> FileRecord:
+    async def update(self, file_id: str, data: FileUpdateRequest) -> FileRecord:
         """
         Update a file record.
 
@@ -240,7 +253,7 @@ class AsyncR2IndexClient:
         result = self._handle_response(response)
         return FileRecord.model_validate(result)
 
-    async def delete_file(self, file_id: str) -> None:
+    async def delete(self, file_id: str) -> None:
         """
         Delete a file by ID.
 
@@ -253,7 +266,7 @@ class AsyncR2IndexClient:
         response = await self._client.delete(f"/files/{file_id}")
         self._handle_response(response)
 
-    async def delete_file_by_tuple(self, remote_tuple: RemoteTuple) -> None:
+    async def delete_by_tuple(self, remote_tuple: RemoteTuple) -> None:
         """
         Delete a file by remote tuple.
 
@@ -272,7 +285,7 @@ class AsyncR2IndexClient:
         response = await self._client.delete("/files", params=params)
         self._handle_response(response)
 
-    async def get_file_by_tuple(self, remote_tuple: RemoteTuple) -> FileRecord:
+    async def get_by_tuple(self, remote_tuple: RemoteTuple) -> FileRecord:
         """
         Get a file by remote tuple.
 
@@ -295,7 +308,7 @@ class AsyncR2IndexClient:
         data = self._handle_response(response)
         return FileRecord.model_validate(data)
 
-    async def get_index(
+    async def index(
         self,
         bucket: str | None = None,
         category: str | None = None,
@@ -497,10 +510,10 @@ class AsyncR2IndexClient:
 
     # High-Level Pipeline
 
-    async def upload_and_register(
+    async def upload(
         self,
-        local_path: str | Path,
         bucket: str,
+        local_path: str | Path,
         category: str,
         entity: str,
         remote_path: str,
@@ -521,8 +534,8 @@ class AsyncR2IndexClient:
         3. Register with r2index API
 
         Args:
-            local_path: Local path to the file to upload.
             bucket: The S3/R2 bucket name.
+            local_path: Local path to the file to upload.
             category: File category.
             entity: File entity.
             remote_path: Remote path in R2 (e.g., "/data/files").
@@ -553,6 +566,7 @@ class AsyncR2IndexClient:
         # Step 3: Upload to R2
         await uploader.upload_file(
             local_path,
+            bucket,
             object_key,
             content_type=content_type,
             progress_callback=progress_callback,
@@ -576,7 +590,7 @@ class AsyncR2IndexClient:
             sha512=checksums.sha512,
         )
 
-        return await self.create_file(create_request)
+        return await self.create(create_request)
 
     async def _get_public_ip(self) -> str:
         """Fetch public IP address from checkip.amazonaws.com."""
@@ -584,7 +598,7 @@ class AsyncR2IndexClient:
             response = await client.get(CHECKIP_URL, timeout=10.0)
             return response.text.strip()
 
-    async def download_and_record(
+    async def download(
         self,
         bucket: str,
         object_id: str,
@@ -613,7 +627,7 @@ class AsyncR2IndexClient:
             destination: Local path where the file will be saved.
             ip_address: IP address of the downloader. If not provided, fetched
                 from checkip.amazonaws.com.
-            user_agent: User agent string. Defaults to "elaunira-r2index/0.1.0".
+            user_agent: User agent string. Defaults to "elaunira-r2index/<version>".
             progress_callback: Optional callback for download progress.
             transfer_config: Optional transfer configuration for multipart/threading.
 
@@ -638,11 +652,12 @@ class AsyncR2IndexClient:
         remote_tuple = _parse_object_id(object_id, bucket)
 
         # Step 2: Get file record by tuple
-        file_record = await self.get_file_by_tuple(remote_tuple)
+        file_record = await self.get_by_tuple(remote_tuple)
 
         # Step 3: Build R2 object key and download
         object_key = object_id.strip("/")
         downloaded_path = await storage.download_file(
+            bucket,
             object_key,
             destination,
             progress_callback=progress_callback,

{elaunira_r2index-0.2.0 → elaunira_r2index-0.3.1}/src/elaunira/r2index/async_storage.py

@@ -26,6 +26,7 @@ class AsyncR2Storage:
     async def upload_file(
         self,
         file_path: str | Path,
+        bucket: str,
         object_key: str,
         content_type: str | None = None,
         progress_callback: Callable[[int], None] | None = None,
@@ -38,6 +39,7 @@ class AsyncR2Storage:
 
         Args:
             file_path: Path to the file to upload.
+            bucket: The R2 bucket name.
             object_key: The key (path) to store the object under in R2.
             content_type: Optional content type for the object.
             progress_callback: Optional callback called with bytes uploaded so far.
@@ -78,7 +80,7 @@ class AsyncR2Storage:
 
                 await client.upload_file(
                     str(file_path),
-                    self.config.bucket,
+                    bucket,
                     object_key,
                     ExtraArgs=extra_args if extra_args else None,
                     Callback=callback,
@@ -88,11 +90,12 @@ class AsyncR2Storage:
 
         return object_key
 
-    async def delete_object(self, object_key: str) -> None:
+    async def delete_object(self, bucket: str, object_key: str) -> None:
         """
         Delete an object from R2 asynchronously.
 
         Args:
+            bucket: The R2 bucket name.
             object_key: The key of the object to delete.
 
         Raises:
@@ -106,15 +109,16 @@ class AsyncR2Storage:
                 endpoint_url=self.config.endpoint_url,
                 region_name=self.config.region,
             ) as client:
-                await client.delete_object(Bucket=self.config.bucket, Key=object_key)
+                await client.delete_object(Bucket=bucket, Key=object_key)
         except Exception as e:
             raise UploadError(f"Failed to delete object from R2: {e}") from e
 
-    async def object_exists(self, object_key: str) -> bool:
+    async def object_exists(self, bucket: str, object_key: str) -> bool:
         """
         Check if an object exists in R2 asynchronously.
 
         Args:
+            bucket: The R2 bucket name.
             object_key: The key of the object to check.
 
         Returns:
@@ -128,7 +132,7 @@ class AsyncR2Storage:
                 endpoint_url=self.config.endpoint_url,
                 region_name=self.config.region,
             ) as client:
-                await client.head_object(Bucket=self.config.bucket, Key=object_key)
+                await client.head_object(Bucket=bucket, Key=object_key)
                 return True
         except client.exceptions.ClientError as e:
             if e.response["Error"]["Code"] == "404":
@@ -137,6 +141,7 @@ class AsyncR2Storage:
 
     async def download_file(
         self,
+        bucket: str,
         object_key: str,
         file_path: str | Path,
         progress_callback: Callable[[int], None] | None = None,
@@ -146,6 +151,7 @@ class AsyncR2Storage:
         Download a file from R2 asynchronously.
 
         Args:
+            bucket: The R2 bucket name.
             object_key: The key (path) of the object in R2.
             file_path: Local path where the file will be saved.
             progress_callback: Optional callback called with bytes downloaded so far.
@@ -181,7 +187,7 @@ class AsyncR2Storage:
                     callback = _AsyncProgressCallback(progress_callback)
 
                 await client.download_file(
-                    self.config.bucket,
+                    bucket,
                     object_key,
                     str(file_path),
                     Callback=callback,

{elaunira_r2index-0.2.0 → elaunira_r2index-0.3.1}/src/elaunira/r2index/client.py

@@ -80,29 +80,42 @@ class R2IndexClient:
 
     def __init__(
         self,
-        api_url: str,
-        api_token: str,
-        r2_config: R2Config | None = None,
+        index_api_url: str,
+        index_api_token: str,
+        r2_access_key_id: str | None = None,
+        r2_secret_access_key: str | None = None,
+        r2_endpoint_url: str | None = None,
         timeout: float = 30.0,
     ) -> None:
         """
         Initialize the R2Index client.
 
         Args:
-            api_url: Base URL of the r2index API.
-            api_token: Bearer token for authentication.
-            r2_config: Optional R2 configuration for upload operations.
+            index_api_url: Base URL of the r2index API.
+            index_api_token: Bearer token for authentication.
+            r2_access_key_id: R2 access key ID for storage operations.
+            r2_secret_access_key: R2 secret access key for storage operations.
+            r2_endpoint_url: R2 endpoint URL for storage operations.
             timeout: Request timeout in seconds.
         """
-        self.api_url = api_url.rstrip("/")
-        self._token = api_token
+        self.api_url = index_api_url.rstrip("/")
+        self._token = index_api_token
         self._timeout = timeout
-        self._r2_config = r2_config
         self._storage: R2Storage | None = None
 
+        # Build R2 config if credentials provided
+        if r2_access_key_id and r2_secret_access_key and r2_endpoint_url:
+            self._r2_config: R2Config | None = R2Config(
+                access_key_id=r2_access_key_id,
+                secret_access_key=r2_secret_access_key,
+                endpoint_url=r2_endpoint_url,
+            )
+        else:
+            self._r2_config = None
+
         self._client = httpx.Client(
             base_url=self.api_url,
-            headers={"Authorization": f"Bearer {api_token}"},
+            headers={"Authorization": f"Bearer {index_api_token}"},
             timeout=timeout,
         )
 
@@ -149,7 +162,7 @@ class R2IndexClient:
 
     # File Operations
 
-    def list_files(
+    def list(
         self,
         bucket: str | None = None,
         category: str | None = None,
@@ -190,7 +203,7 @@ class R2IndexClient:
         data = self._handle_response(response)
         return FileListResponse.model_validate(data)
 
-    def create_file(self, data: FileCreateRequest) -> FileRecord:
+    def create(self, data: FileCreateRequest) -> FileRecord:
         """
         Create or upsert a file record.
 
@@ -204,7 +217,7 @@ class R2IndexClient:
         result = self._handle_response(response)
         return FileRecord.model_validate(result)
 
-    def get_file(self, file_id: str) -> FileRecord:
+    def get(self, file_id: str) -> FileRecord:
         """
         Get a file by ID.
 
@@ -221,7 +234,7 @@ class R2IndexClient:
         data = self._handle_response(response)
         return FileRecord.model_validate(data)
 
-    def update_file(self, file_id: str, data: FileUpdateRequest) -> FileRecord:
+    def update(self, file_id: str, data: FileUpdateRequest) -> FileRecord:
         """
         Update a file record.
 
@@ -239,7 +252,7 @@ class R2IndexClient:
         result = self._handle_response(response)
         return FileRecord.model_validate(result)
 
-    def delete_file(self, file_id: str) -> None:
+    def delete(self, file_id: str) -> None:
         """
         Delete a file by ID.
 
@@ -252,7 +265,7 @@ class R2IndexClient:
         response = self._client.delete(f"/files/{file_id}")
         self._handle_response(response)
 
-    def delete_file_by_tuple(self, remote_tuple: RemoteTuple) -> None:
+    def delete_by_tuple(self, remote_tuple: RemoteTuple) -> None:
         """
         Delete a file by remote tuple.
 
@@ -271,7 +284,7 @@ class R2IndexClient:
         response = self._client.delete("/files", params=params)
         self._handle_response(response)
 
-    def get_file_by_tuple(self, remote_tuple: RemoteTuple) -> FileRecord:
+    def get_by_tuple(self, remote_tuple: RemoteTuple) -> FileRecord:
         """
         Get a file by remote tuple.
 
@@ -294,7 +307,7 @@ class R2IndexClient:
         data = self._handle_response(response)
         return FileRecord.model_validate(data)
 
-    def get_index(
+    def index(
         self,
         bucket: str | None = None,
         category: str | None = None,
@@ -496,10 +509,10 @@ class R2IndexClient:
 
     # High-Level Pipeline
 
-    def upload_and_register(
+    def upload(
         self,
-        local_path: str | Path,
         bucket: str,
+        local_path: str | Path,
         category: str,
         entity: str,
         remote_path: str,
@@ -520,8 +533,8 @@ class R2IndexClient:
         3. Register with r2index API
 
         Args:
-            local_path: Local path to the file to upload.
             bucket: The S3/R2 bucket name.
+            local_path: Local path to the file to upload.
             category: File category.
             entity: File entity.
             remote_path: Remote path in R2 (e.g., "/data/files").
@@ -552,6 +565,7 @@ class R2IndexClient:
         # Step 3: Upload to R2
         uploader.upload_file(
             local_path,
+            bucket,
             object_key,
             content_type=content_type,
             progress_callback=progress_callback,
@@ -575,14 +589,14 @@ class R2IndexClient:
             sha512=checksums.sha512,
         )
 
-        return self.create_file(create_request)
+        return self.create(create_request)
 
     def _get_public_ip(self) -> str:
         """Fetch public IP address from checkip.amazonaws.com."""
         response = httpx.get(CHECKIP_URL, timeout=10.0)
         return response.text.strip()
 
-    def download_and_record(
+    def download(
         self,
         bucket: str,
         object_id: str,
@@ -611,7 +625,7 @@ class R2IndexClient:
             destination: Local path where the file will be saved.
             ip_address: IP address of the downloader. If not provided, fetched
                 from checkip.amazonaws.com.
-            user_agent: User agent string. Defaults to "elaunira-r2index/0.1.0".
+            user_agent: User agent string. Defaults to "elaunira-r2index/<version>".
             progress_callback: Optional callback for download progress.
             transfer_config: Optional transfer configuration for multipart/threading.
 
@@ -636,11 +650,12 @@ class R2IndexClient:
         remote_tuple = _parse_object_id(object_id, bucket)
 
         # Step 2: Get file record by tuple
-        file_record = self.get_file_by_tuple(remote_tuple)
+        file_record = self.get_by_tuple(remote_tuple)
 
         # Step 3: Build R2 object key and download
         object_key = object_id.strip("/")
         downloaded_path = storage.download_file(
+            bucket,
             object_key,
             destination,
             progress_callback=progress_callback,

{elaunira_r2index-0.2.0 → elaunira_r2index-0.3.1}/src/elaunira/r2index/models.py

@@ -206,4 +206,4 @@ class HealthResponse(BaseModel):
     """Response for health check."""
 
     status: str
-    timestamp: datetime
+    timestamp: datetime | None = None

{elaunira_r2index-0.2.0 → elaunira_r2index-0.3.1}/src/elaunira/r2index/storage.py

@@ -43,9 +43,8 @@ class R2Config:
     """Configuration for R2 storage."""
 
     access_key_id: str
-    secret_access_key: str
     endpoint_url: str
-    bucket: str
+    secret_access_key: str
     region: str = "auto"
 
 
@@ -71,6 +70,7 @@ class R2Storage:
     def upload_file(
         self,
         file_path: str | Path,
+        bucket: str,
         object_key: str,
         content_type: str | None = None,
         progress_callback: Callable[[int], None] | None = None,
@@ -83,6 +83,7 @@ class R2Storage:
 
         Args:
             file_path: Path to the file to upload.
+            bucket: The R2 bucket name.
             object_key: The key (path) to store the object under in R2.
             content_type: Optional content type for the object.
             progress_callback: Optional callback called with bytes uploaded so far.
@@ -118,7 +119,7 @@ class R2Storage:
         try:
             self._client.upload_file(
                 str(file_path),
-                self.config.bucket,
+                bucket,
                 object_key,
                 Config=boto_transfer_config,
                 ExtraArgs=extra_args if extra_args else None,
@@ -129,33 +130,35 @@ class R2Storage:
 
         return object_key
 
-    def delete_object(self, object_key: str) -> None:
+    def delete_object(self, bucket: str, object_key: str) -> None:
         """
         Delete an object from R2.
 
         Args:
+            bucket: The R2 bucket name.
             object_key: The key of the object to delete.
 
         Raises:
             UploadError: If the deletion fails.
         """
         try:
-            self._client.delete_object(Bucket=self.config.bucket, Key=object_key)
+            self._client.delete_object(Bucket=bucket, Key=object_key)
         except Exception as e:
             raise UploadError(f"Failed to delete object from R2: {e}") from e
 
-    def object_exists(self, object_key: str) -> bool:
+    def object_exists(self, bucket: str, object_key: str) -> bool:
         """
         Check if an object exists in R2.
 
         Args:
+            bucket: The R2 bucket name.
             object_key: The key of the object to check.
 
         Returns:
             True if the object exists, False otherwise.
         """
         try:
-            self._client.head_object(Bucket=self.config.bucket, Key=object_key)
+            self._client.head_object(Bucket=bucket, Key=object_key)
             return True
         except self._client.exceptions.ClientError as e:
             if e.response["Error"]["Code"] == "404":
@@ -164,6 +167,7 @@ class R2Storage:
 
     def download_file(
         self,
+        bucket: str,
         object_key: str,
         file_path: str | Path,
         progress_callback: Callable[[int], None] | None = None,
@@ -173,6 +177,7 @@ class R2Storage:
         Download a file from R2.
 
         Args:
+            bucket: The R2 bucket name.
             object_key: The key (path) of the object in R2.
             file_path: Local path where the file will be saved.
             progress_callback: Optional callback called with bytes downloaded so far.
@@ -203,7 +208,7 @@ class R2Storage:
 
         try:
             self._client.download_file(
-                self.config.bucket,
+                bucket,
                 object_key,
                 str(file_path),
                 Config=boto_transfer_config,

{elaunira_r2index-0.2.0 → elaunira_r2index-0.3.1}/tests/test_async_client.py

@@ -10,8 +10,8 @@ from elaunira.r2index import AsyncR2IndexClient, FileCreateRequest
 def async_client():
     """Create a test async client."""
     return AsyncR2IndexClient(
-        api_url="https://api.example.com",
-        api_token="test-token",
+        index_api_url="https://api.example.com",
+        index_api_token="test-token",
     )
 
 
@@ -19,14 +19,14 @@ def async_client():
 async def test_async_client_context_manager():
     """Test async client as context manager."""
     async with AsyncR2IndexClient(
-        api_url="https://api.example.com",
-        api_token="test-token",
+        index_api_url="https://api.example.com",
+        index_api_token="test-token",
     ) as client:
         assert client is not None
 
 
 @pytest.mark.asyncio
-async def test_async_list_files(async_client: AsyncR2IndexClient, httpx_mock: HTTPXMock):
+async def test_async_list(async_client: AsyncR2IndexClient, httpx_mock: HTTPXMock):
     """Test async listing files."""
     httpx_mock.add_response(
         url="https://api.example.com/files",
@@ -56,13 +56,13 @@ async def test_async_list_files(async_client: AsyncR2IndexClient, httpx_mock: HT
         },
     )
 
-    response = await async_client.list_files()
+    response = await async_client.list()
     assert len(response.files) == 1
     await async_client.close()
 
 
 @pytest.mark.asyncio
-async def test_async_create_file(async_client: AsyncR2IndexClient, httpx_mock: HTTPXMock):
+async def test_async_create(async_client: AsyncR2IndexClient, httpx_mock: HTTPXMock):
     """Test async creating a file record."""
     httpx_mock.add_response(
         url="https://api.example.com/files",
@@ -100,7 +100,7 @@ async def test_async_create_file(async_client: AsyncR2IndexClient, httpx_mock: H
         sha256="ghi",
         sha512="jkl",
     )
-    record = await async_client.create_file(request)
+    record = await async_client.create(request)
     assert record.id == "new-file"
     await async_client.close()
 

{elaunira_r2index-0.2.0 → elaunira_r2index-0.3.1}/tests/test_client.py

@@ -16,8 +16,8 @@ from elaunira.r2index import (
 def client():
     """Create a test client."""
     return R2IndexClient(
-        api_url="https://api.example.com",
-        api_token="test-token",
+        index_api_url="https://api.example.com",
+        index_api_token="test-token",
     )
 
 
@@ -29,13 +29,13 @@ def test_client_initialization(client: R2IndexClient):
 def test_client_context_manager():
     """Test client as context manager."""
     with R2IndexClient(
-        api_url="https://api.example.com",
-        api_token="test-token",
+        index_api_url="https://api.example.com",
+        index_api_token="test-token",
     ) as client:
         assert client is not None
 
 
-def test_list_files(client: R2IndexClient, httpx_mock: HTTPXMock):
+def test_list(client: R2IndexClient, httpx_mock: HTTPXMock):
     """Test listing files."""
     httpx_mock.add_response(
         url="https://api.example.com/files",
@@ -65,19 +65,19 @@ def test_list_files(client: R2IndexClient, httpx_mock: HTTPXMock):
         },
     )
 
-    response = client.list_files()
+    response = client.list()
     assert len(response.files) == 1
     assert response.files[0].id == "file1"
 
 
-def test_list_files_with_filters(client: R2IndexClient, httpx_mock: HTTPXMock):
+def test_list_with_filters(client: R2IndexClient, httpx_mock: HTTPXMock):
     """Test listing files with filters."""
     httpx_mock.add_response(
         url="https://api.example.com/files?category=software&entity=myapp&tags=release%2Cstable",
         json={"files": [], "total": 0, "page": 1, "pageSize": 20},
     )
 
-    response = client.list_files(
+    response = client.list(
         category="software",
         entity="myapp",
         tags=["release", "stable"],
@@ -85,7 +85,7 @@ def test_list_files_with_filters(client: R2IndexClient, httpx_mock: HTTPXMock):
     assert response.total == 0
 
 
-def test_create_file(client: R2IndexClient, httpx_mock: HTTPXMock):
+def test_create(client: R2IndexClient, httpx_mock: HTTPXMock):
     """Test creating a file record."""
     httpx_mock.add_response(
         url="https://api.example.com/files",
@@ -123,11 +123,11 @@ def test_create_file(client: R2IndexClient, httpx_mock: HTTPXMock):
         sha256="ghi",
         sha512="jkl",
     )
-    record = client.create_file(request)
+    record = client.create(request)
     assert record.id == "new-file"
 
 
-def test_get_file(client: R2IndexClient, httpx_mock: HTTPXMock):
+def test_get(client: R2IndexClient, httpx_mock: HTTPXMock):
     """Test getting a file by ID."""
     httpx_mock.add_response(
         url="https://api.example.com/files/file123",
@@ -150,11 +150,11 @@ def test_get_file(client: R2IndexClient, httpx_mock: HTTPXMock):
         },
     )
 
-    record = client.get_file("file123")
+    record = client.get("file123")
     assert record.id == "file123"
 
 
-def test_get_file_not_found(client: R2IndexClient, httpx_mock: HTTPXMock):
+def test_get_not_found(client: R2IndexClient, httpx_mock: HTTPXMock):
     """Test 404 error handling."""
     httpx_mock.add_response(
         url="https://api.example.com/files/notfound",
@@ -163,7 +163,7 @@ def test_get_file_not_found(client: R2IndexClient, httpx_mock: HTTPXMock):
     )
 
     with pytest.raises(NotFoundError) as exc_info:
-        client.get_file("notfound")
+        client.get("notfound")
 
     assert exc_info.value.status_code == 404
 
@@ -177,7 +177,7 @@ def test_authentication_error(client: R2IndexClient, httpx_mock: HTTPXMock):
     )
 
     with pytest.raises(AuthenticationError) as exc_info:
-        client.list_files()
+        client.list()
 
     assert exc_info.value.status_code == 401
 
@@ -206,7 +206,7 @@ def test_validation_error(client: R2IndexClient, httpx_mock: HTTPXMock):
     )
 
     with pytest.raises(ValidationError) as exc_info:
-        client.create_file(request)
+        client.create(request)
 
     assert exc_info.value.status_code == 400
 

{elaunira_r2index-0.2.0 → elaunira_r2index-0.3.1}/tests/test_download.py

@@ -11,7 +11,7 @@ from elaunira.r2index import (
     RemoteTuple,
 )
 from elaunira.r2index.client import _parse_object_id
-from elaunira.r2index.storage import R2Config, R2TransferConfig
+from elaunira.r2index.storage import R2TransferConfig
 
 
 class TestParseObjectId:
@@ -74,18 +74,18 @@ class TestParseObjectId:
             _parse_object_id("", "test-bucket")
 
 
-class TestGetFileByTuple:
-    """Tests for get_file_by_tuple method."""
+class TestGetByTuple:
+    """Tests for get_by_tuple method."""
 
     @pytest.fixture
     def client(self):
         """Create a test client."""
         return R2IndexClient(
-            api_url="https://api.example.com",
-            api_token="test-token",
+            index_api_url="https://api.example.com",
+            index_api_token="test-token",
         )
 
-    def test_get_file_by_tuple(self, client: R2IndexClient, httpx_mock: HTTPXMock):
+    def test_get_by_tuple(self, client: R2IndexClient, httpx_mock: HTTPXMock):
         """Test getting a file by remote tuple."""
         httpx_mock.add_response(
             url="https://api.example.com/files/by-tuple?bucket=test-bucket&remotePath=%2Freleases%2Fmyapp&remoteFilename=myapp.zip&remoteVersion=v1",
@@ -114,7 +114,7 @@ class TestGetFileByTuple:
             remote_filename="myapp.zip",
             remote_version="v1",
         )
-        record = client.get_file_by_tuple(remote_tuple)
+        record = client.get_by_tuple(remote_tuple)
 
         assert record.id == "file123"
         assert record.bucket == "test-bucket"
@@ -123,35 +123,31 @@ class TestGetFileByTuple:
         assert record.remote_version == "v1"
 
 
-class TestDownloadAndRecord:
-    """Tests for download_and_record method."""
+class TestDownload:
+    """Tests for download method."""
 
     @pytest.fixture
     def client_with_r2(self):
         """Create a test client with R2 config."""
-        r2_config = R2Config(
-            access_key_id="test-key",
-            secret_access_key="test-secret",
-            endpoint_url="https://r2.example.com",
-            bucket="test-bucket",
-        )
         return R2IndexClient(
-            api_url="https://api.example.com",
-            api_token="test-token",
-            r2_config=r2_config,
+            index_api_url="https://api.example.com",
+            index_api_token="test-token",
+            r2_access_key_id="test-key",
+            r2_secret_access_key="test-secret",
+            r2_endpoint_url="https://r2.example.com",
         )
 
-    def test_download_and_record_with_defaults(
+    def test_download_with_defaults(
         self, client_with_r2: R2IndexClient, httpx_mock: HTTPXMock, tmp_path: Path
     ):
-        """Test download_and_record with default IP and user agent."""
+        """Test download with default IP and user agent."""
         # Mock checkip.amazonaws.com
         httpx_mock.add_response(
             url="https://checkip.amazonaws.com",
             text="203.0.113.1\n",
         )
 
-        # Mock get_file_by_tuple
+        # Mock get_by_tuple
         httpx_mock.add_response(
             url="https://api.example.com/files/by-tuple?bucket=test-bucket&remotePath=%2Freleases%2Fmyapp&remoteFilename=myapp.zip&remoteVersion=v1",
             json={
@@ -195,7 +191,7 @@ class TestDownloadAndRecord:
             "download_file",
             return_value=destination,
         ) as mock_download:
-            downloaded_path, file_record = client_with_r2.download_and_record(
+            downloaded_path, file_record = client_with_r2.download(
                 bucket="test-bucket",
                 object_id="/releases/myapp/v1/myapp.zip",
                 destination=str(destination),
@@ -205,11 +201,11 @@ class TestDownloadAndRecord:
             assert downloaded_path == destination
             assert file_record.id == "file123"
 
-    def test_download_and_record_with_explicit_ip_and_user_agent(
+    def test_download_with_explicit_ip_and_user_agent(
         self, client_with_r2: R2IndexClient, httpx_mock: HTTPXMock, tmp_path: Path
     ):
-        """Test download_and_record with explicit IP and user agent."""
-        # Mock get_file_by_tuple
+        """Test download with explicit IP and user agent."""
+        # Mock get_by_tuple
         httpx_mock.add_response(
             url="https://api.example.com/files/by-tuple?bucket=test-bucket&remotePath=%2Freleases%2Fmyapp&remoteFilename=myapp.zip&remoteVersion=v1",
             json={
@@ -253,7 +249,7 @@ class TestDownloadAndRecord:
             "download_file",
             return_value=destination,
         ):
-            downloaded_path, file_record = client_with_r2.download_and_record(
+            downloaded_path, file_record = client_with_r2.download(
                 bucket="test-bucket",
                 object_id="/releases/myapp/v1/myapp.zip",
                 destination=str(destination),
@@ -264,14 +260,14 @@ class TestDownloadAndRecord:
             assert downloaded_path == destination
             assert file_record.id == "file123"
 
-    def test_download_and_record_invalid_object_id(
+    def test_download_invalid_object_id(
         self, client_with_r2: R2IndexClient, tmp_path: Path
     ):
-        """Test download_and_record with invalid object ID."""
+        """Test download with invalid object ID."""
         destination = tmp_path / "file.zip"
 
         with pytest.raises(ValueError) as exc_info:
-            client_with_r2.download_and_record(
+            client_with_r2.download(
                 bucket="test-bucket",
                 object_id="/invalid/path",
                 destination=str(destination),