tuspyserver 2.0.0__tar.gz → 2.2.0__tar.gz

tuspyserver-2.2.0/PKG-INFO

@@ -0,0 +1,166 @@
+Metadata-Version: 2.4
+Name: tuspyserver
+Version: 2.2.0
+Summary: TUS py protocol implementation in FastAPI
+Home-page: https://github.com/edihasaj/tuspy-fast-api
+Author: Edi Hasaj
+Author-email: edi.hasaj@applifyer.com
+License: MIT
+Platform: any
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: fastapi>=0.110.0
+Requires-Dist: pydantic>=2.6.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: summary
+
+# FastAPI Tus
+
+A FastAPI extension implementing the [Tus.io](https://tus.io/) upload protocol, with optional dependency-injected hooks for post-upload processing.
+
+## Prerequisites
+
+* **Python** 3.8+
+* **FastAPI** 0.70+
+* **Starlette** (installed as FastAPI dependency)
+
+## Installation
+
+Install the latest stable release from PyPI:
+
+```bash
+pip install tuspyserver
+```
+
+Or install directly from source:
+
+```bash
+git clone https://github.com/your-org/tuspyserver.git
+cd tuspyserver
+pip install .
+```
+
+## Usage
+
+### Basic setup
+
+In your `main.py`:
+
+```python
+from fastapi import FastAPI
+from starlette.middleware.cors import CORSMiddleware
+from starlette.staticfiles import StaticFiles
+
+from tusserver.tus import create_api_router
+
+app = FastAPI()
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+app.mount("/static", StaticFiles(directory="static"), name="static")
+
+# Optional: define a simple completion hook
+def on_upload_complete(file_path: str, metadata: dict):
+    print("Upload complete:", file_path)
+    print("Metadata:", metadata)
+
+# Include the router
+app.include_router(
+    create_api_router(
+        files_dir="/tmp/uploads",        # OPTIONAL: directory to store files
+        max_size=128_849_018_880,         # OPTIONAL: max upload size in bytes (~120GB)
+        on_upload_complete=on_upload_complete,  # OPTIONAL: callback when upload finishes
+        prefix="files",                 # OPTIONAL: URL prefix (default: 'files')
+    ),
+)
+```
+
+### Dependency‑Injected Hook (Advanced)
+
+For applications using FastAPI's dependency injection, you can supply a factory that returns a DI‑enabled callback. This factory can `Depends()` on any of your services (database session, current user, etc.).
+
+```python
+# Define a factory dependency that injects your own services
+from fastapi import Depends
+from your_app.dependencies import get_db, get_current_user
+
+def get_upload_handler(
+    db=Depends(get_db),
+    current_user=Depends(get_current_user),
+) -> Callable[[str, dict], None]:
+    def handler(file_path: str, metadata: dict):
+        # perform validation or post-processing
+        db.log_upload(current_user.id, metadata)
+        process_file(file_path)
+    return handler
+
+# Include router with the DI hook
+app.include_router(
+    create_api_router(
+        on_upload_complete=None,            # keep default
+        upload_complete_dep=get_upload_handler,  # factory dependency
+    )
+)
+```
+
+### Features
+
+* **Resumable uploads** via TUS protocol
+* **Chunked transfer** with configurable max size
+* **Metadata storage** (filename, filetype)
+* **Expiration & cleanup** of old uploads (default retention: 5 days)
+* **Download**, **HEAD**, **DELETE**, and **OPTIONS** endpoints
+* **Optional** DI‑friendly `upload_complete_dep` for seamless integration with FastAPI
+
+## Scheduler (Cleanup)
+
+Expired files are removed when `remove_expired_files()` is called. You can schedule it using your preferred background scheduler (e.g., `APScheduler`, `cron`).
+
+```python
+from apscheduler.schedulers.background import BackgroundScheduler
+
+scheduler = BackgroundScheduler()
+scheduler.add_job(
+    lambda: router.remove_expired_files(),
+    trigger='cron',
+    hour=1,
+)
+scheduler.start()
+```
+
+## Versioning & Publishing
+
+**Before releasing:**
+
+1. Update the version in `setup.py`:
+
+   * **Patch** for bug fixes
+   * **Minor** for new features
+   * **Major** for breaking changes
+2. Commit and push to `main`.
+3. Open a PR to merge `main` → `production`.
+4. Upon merge, CI/CD will publish to PyPI.
+
+## Contributing
+
+Contributions welcome! Please open issues or PRs on [GitHub](https://github.com/your-org/tuspyserver).
+
+*© 2025 Edi Hasaj [X](https://x.com/hasajedi)*

tuspyserver-2.2.0/README.md

@@ -0,0 +1,135 @@
+# FastAPI Tus
+
+A FastAPI extension implementing the [Tus.io](https://tus.io/) upload protocol, with optional dependency-injected hooks for post-upload processing.
+
+## Prerequisites
+
+* **Python** 3.8+
+* **FastAPI** 0.70+
+* **Starlette** (installed as FastAPI dependency)
+
+## Installation
+
+Install the latest stable release from PyPI:
+
+```bash
+pip install tuspyserver
+```
+
+Or install directly from source:
+
+```bash
+git clone https://github.com/your-org/tuspyserver.git
+cd tuspyserver
+pip install .
+```
+
+## Usage
+
+### Basic setup
+
+In your `main.py`:
+
+```python
+from fastapi import FastAPI
+from starlette.middleware.cors import CORSMiddleware
+from starlette.staticfiles import StaticFiles
+
+from tusserver.tus import create_api_router
+
+app = FastAPI()
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+app.mount("/static", StaticFiles(directory="static"), name="static")
+
+# Optional: define a simple completion hook
+def on_upload_complete(file_path: str, metadata: dict):
+    print("Upload complete:", file_path)
+    print("Metadata:", metadata)
+
+# Include the router
+app.include_router(
+    create_api_router(
+        files_dir="/tmp/uploads",        # OPTIONAL: directory to store files
+        max_size=128_849_018_880,         # OPTIONAL: max upload size in bytes (~120GB)
+        on_upload_complete=on_upload_complete,  # OPTIONAL: callback when upload finishes
+        prefix="files",                 # OPTIONAL: URL prefix (default: 'files')
+    ),
+)
+```
+
+### Dependency‑Injected Hook (Advanced)
+
+For applications using FastAPI's dependency injection, you can supply a factory that returns a DI‑enabled callback. This factory can `Depends()` on any of your services (database session, current user, etc.).
+
+```python
+# Define a factory dependency that injects your own services
+from fastapi import Depends
+from your_app.dependencies import get_db, get_current_user
+
+def get_upload_handler(
+    db=Depends(get_db),
+    current_user=Depends(get_current_user),
+) -> Callable[[str, dict], None]:
+    def handler(file_path: str, metadata: dict):
+        # perform validation or post-processing
+        db.log_upload(current_user.id, metadata)
+        process_file(file_path)
+    return handler
+
+# Include router with the DI hook
+app.include_router(
+    create_api_router(
+        on_upload_complete=None,            # keep default
+        upload_complete_dep=get_upload_handler,  # factory dependency
+    )
+)
+```
+
+### Features
+
+* **Resumable uploads** via TUS protocol
+* **Chunked transfer** with configurable max size
+* **Metadata storage** (filename, filetype)
+* **Expiration & cleanup** of old uploads (default retention: 5 days)
+* **Download**, **HEAD**, **DELETE**, and **OPTIONS** endpoints
+* **Optional** DI‑friendly `upload_complete_dep` for seamless integration with FastAPI
+
+## Scheduler (Cleanup)
+
+Expired files are removed when `remove_expired_files()` is called. You can schedule it using your preferred background scheduler (e.g., `APScheduler`, `cron`).
+
+```python
+from apscheduler.schedulers.background import BackgroundScheduler
+
+scheduler = BackgroundScheduler()
+scheduler.add_job(
+    lambda: router.remove_expired_files(),
+    trigger='cron',
+    hour=1,
+)
+scheduler.start()
+```
+
+## Versioning & Publishing
+
+**Before releasing:**
+
+1. Update the version in `setup.py`:
+
+   * **Patch** for bug fixes
+   * **Minor** for new features
+   * **Major** for breaking changes
+2. Commit and push to `main`.
+3. Open a PR to merge `main` → `production`.
+4. Upon merge, CI/CD will publish to PyPI.
+
+## Contributing
+
+Contributions welcome! Please open issues or PRs on [GitHub](https://github.com/your-org/tuspyserver).
+
+*© 2025 Edi Hasaj [X](https://x.com/hasajedi)*

tuspyserver-2.2.0/setup.py

@@ -0,0 +1,38 @@
+"""
+FastAPI Tus implementation
+-------------
+Implements the tus.io server-side file-upload protocol
+visit https://tus.io for more information
+"""
+
+from setuptools import find_packages, setup
+
+with open("README.md", "r") as f:
+    long_description = f.read()
+
+setup(
+    name="tuspyserver",
+    version="2.2.0",
+    description="TUS py protocol implementation in FastAPI",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    author="Edi Hasaj",
+    license="MIT",
+    author_email="edi.hasaj@applifyer.com",
+    url="https://github.com/edihasaj/tuspy-fast-api",
+    packages=find_packages(),
+    platforms="any",
+    include_package_data=True,
+    install_requires=[
+        "fastapi>=0.110.0",
+        "pydantic>=2.6.2",
+    ],
+    classifiers=[
+        "Environment :: Web Environment",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+    ],
+)

tuspyserver-2.2.0/tuspyserver.egg-info/PKG-INFO

@@ -0,0 +1,166 @@
+Metadata-Version: 2.4
+Name: tuspyserver
+Version: 2.2.0
+Summary: TUS py protocol implementation in FastAPI
+Home-page: https://github.com/edihasaj/tuspy-fast-api
+Author: Edi Hasaj
+Author-email: edi.hasaj@applifyer.com
+License: MIT
+Platform: any
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: fastapi>=0.110.0
+Requires-Dist: pydantic>=2.6.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: summary
+
+# FastAPI Tus
+
+A FastAPI extension implementing the [Tus.io](https://tus.io/) upload protocol, with optional dependency-injected hooks for post-upload processing.
+
+## Prerequisites
+
+* **Python** 3.8+
+* **FastAPI** 0.70+
+* **Starlette** (installed as FastAPI dependency)
+
+## Installation
+
+Install the latest stable release from PyPI:
+
+```bash
+pip install tuspyserver
+```
+
+Or install directly from source:
+
+```bash
+git clone https://github.com/your-org/tuspyserver.git
+cd tuspyserver
+pip install .
+```
+
+## Usage
+
+### Basic setup
+
+In your `main.py`:
+
+```python
+from fastapi import FastAPI
+from starlette.middleware.cors import CORSMiddleware
+from starlette.staticfiles import StaticFiles
+
+from tusserver.tus import create_api_router
+
+app = FastAPI()
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+app.mount("/static", StaticFiles(directory="static"), name="static")
+
+# Optional: define a simple completion hook
+def on_upload_complete(file_path: str, metadata: dict):
+    print("Upload complete:", file_path)
+    print("Metadata:", metadata)
+
+# Include the router
+app.include_router(
+    create_api_router(
+        files_dir="/tmp/uploads",        # OPTIONAL: directory to store files
+        max_size=128_849_018_880,         # OPTIONAL: max upload size in bytes (~120GB)
+        on_upload_complete=on_upload_complete,  # OPTIONAL: callback when upload finishes
+        prefix="files",                 # OPTIONAL: URL prefix (default: 'files')
+    ),
+)
+```
+
+### Dependency‑Injected Hook (Advanced)
+
+For applications using FastAPI's dependency injection, you can supply a factory that returns a DI‑enabled callback. This factory can `Depends()` on any of your services (database session, current user, etc.).
+
+```python
+# Define a factory dependency that injects your own services
+from fastapi import Depends
+from your_app.dependencies import get_db, get_current_user
+
+def get_upload_handler(
+    db=Depends(get_db),
+    current_user=Depends(get_current_user),
+) -> Callable[[str, dict], None]:
+    def handler(file_path: str, metadata: dict):
+        # perform validation or post-processing
+        db.log_upload(current_user.id, metadata)
+        process_file(file_path)
+    return handler
+
+# Include router with the DI hook
+app.include_router(
+    create_api_router(
+        on_upload_complete=None,            # keep default
+        upload_complete_dep=get_upload_handler,  # factory dependency
+    )
+)
+```
+
+### Features
+
+* **Resumable uploads** via TUS protocol
+* **Chunked transfer** with configurable max size
+* **Metadata storage** (filename, filetype)
+* **Expiration & cleanup** of old uploads (default retention: 5 days)
+* **Download**, **HEAD**, **DELETE**, and **OPTIONS** endpoints
+* **Optional** DI‑friendly `upload_complete_dep` for seamless integration with FastAPI
+
+## Scheduler (Cleanup)
+
+Expired files are removed when `remove_expired_files()` is called. You can schedule it using your preferred background scheduler (e.g., `APScheduler`, `cron`).
+
+```python
+from apscheduler.schedulers.background import BackgroundScheduler
+
+scheduler = BackgroundScheduler()
+scheduler.add_job(
+    lambda: router.remove_expired_files(),
+    trigger='cron',
+    hour=1,
+)
+scheduler.start()
+```
+
+## Versioning & Publishing
+
+**Before releasing:**
+
+1. Update the version in `setup.py`:
+
+   * **Patch** for bug fixes
+   * **Minor** for new features
+   * **Major** for breaking changes
+2. Commit and push to `main`.
+3. Open a PR to merge `main` → `production`.
+4. Upon merge, CI/CD will publish to PyPI.
+
+## Contributing
+
+Contributions welcome! Please open issues or PRs on [GitHub](https://github.com/your-org/tuspyserver).
+
+*© 2025 Edi Hasaj [X](https://x.com/hasajedi)*

tuspyserver-2.2.0/tusserver/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.0.0"

{tuspyserver-2.0.0 → tuspyserver-2.2.0}/tusserver/metadata.py

@@ -16,13 +16,13 @@ class FileMetadata(BaseModel):
 
     @classmethod
     def from_request(
-            cls,
-            uid: str,
-            metadata: dict[Any, str],
-            size: int,
-            created_at: str,
-            defer_length: bool,
-            expires: str
+        cls,
+        uid: str,
+        metadata: dict[Any, str],
+        size: int,
+        created_at: str,
+        defer_length: bool,
+        expires: str,
     ):
         return FileMetadata(
             uid=uid,
@@ -30,5 +30,5 @@ class FileMetadata(BaseModel):
             size=size,
             created_at=created_at,
             defer_length=defer_length,
-            expires=expires
+            expires=expires,
         )

{tuspyserver-2.0.0 → tuspyserver-2.2.0}/tusserver/tus.py

@@ -5,37 +5,66 @@ from datetime import datetime, timedelta
 from typing import Callable, Optional
 from uuid import uuid4
 
-from fastapi import Header, HTTPException, Response, Request, status, Depends, Path, APIRouter
+from fastapi import (
+    APIRouter,
+    Depends,
+    Header,
+    HTTPException,
+    Path,
+    Request,
+    Response,
+    status,
+)
 from starlette.responses import FileResponse
 
 from tusserver.metadata import FileMetadata
 
+
 def default_auth():
-        pass
+    pass
 
 
 def create_api_router(
-        files_dir='/tmp/files',
-        location='http://127.0.0.1:8000/files',
-        max_size=128849018880,
-        on_upload_complete: Optional[Callable[[str, dict], None]] = None,
-        auth: Optional[Callable[[], None]] = default_auth,
-        days_to_keep: int = 5,
+    files_dir="/tmp/files",
+    max_size=128849018880,
+    on_upload_complete: Optional[Callable[[str, dict], None]] = None,
+    auth: Optional[Callable[[], None]] = default_auth,
+    days_to_keep: int = 5,
+    prefix: str = "files",
+    upload_complete_dep: Optional[Callable[..., Callable[[str, dict], None]]] = None,
 ):
-    router = APIRouter()
+    if prefix and prefix[0] == "/":
+        prefix = prefix[1:]
+    router = APIRouter(prefix=f"/{prefix}")
+
+    tus_version = "1.0.0"
+    tus_extension = (
+        "creation,creation-defer-length,creation-with-upload,expiration,termination"
+    )
+
+    if upload_complete_dep is None:
 
-    tus_version = '1.0.0'
-    tus_extension = 'creation,creation-defer-length,creation-with-upload,expiration,termination'
+        async def _fallback_on_complete_dep() -> Callable[[str, dict], None]:
+            return on_upload_complete or (lambda *_: None)
 
-    async def _get_request_chunk(request: Request, uuid: str = Path(...), post_request: bool = False) -> bool | None:
+        upload_complete_dep = _fallback_on_complete_dep
+
+    async def _get_request_chunk(
+        request: Request, uuid: str = Path(...), post_request: bool = False
+    ) -> bool | None:
         meta = _read_metadata(uuid)
         if not meta or not _file_exists(uuid):
             return False
 
+        # Flag to track if we processed any chunks
+        has_chunks = False
+
         with open(f"{files_dir}/{uuid}", "ab") as f:
             async for chunk in request.stream():
-                if post_request and chunk is None or len(chunk) == 0:
-                    return None
+                has_chunks = True
+                # Skip empty chunks but continue processing
+                if len(chunk) == 0:
+                    continue
 
                 if _get_file_length(uuid) + len(chunk) > max_size:
                     raise HTTPException(status_code=413)
@@ -48,6 +77,15 @@ def create_api_router(
 
             f.close()
 
+        # For empty files in a POST request, we still want to return True
+        # to ensure _get_and_save_the_file gets called
+        if post_request and not has_chunks:
+            # Update metadata for empty file
+            meta.offset = 0
+            meta.upload_chunk_size = 0
+            meta.upload_part += 1
+            _write_metadata(meta)
+
         return True
 
     @router.head("/{uuid}", status_code=status.HTTP_200_OK)
@@ -61,31 +99,36 @@ def create_api_router(
         response.headers["Upload-Length"] = str(meta.size)
         response.headers["Upload-Offset"] = str(meta.offset)
         response.headers["Cache-Control"] = "no-store"
-        response.headers[
-            "Upload-Metadata"] = f"filename {base64.b64encode(bytes(meta.metadata['name'], 'utf-8'))}, " \
-                                 f"filetype {base64.b64encode(bytes(meta.metadata['type'], 'utf-8'))}"
+        response.headers["Upload-Metadata"] = (
+            f"filename {base64.b64encode(bytes(meta.metadata['name'], 'utf-8'))}, "
+            f"filetype {base64.b64encode(bytes(meta.metadata['type'], 'utf-8'))}"
+        )
         response.status_code = status.HTTP_200_OK
         return response
 
     @router.patch("/{uuid}", status_code=status.HTTP_204_NO_CONTENT)
     def upload_chunk(
-            response: Response,
-            uuid: str,
-            content_type: str = Header(None),
-            content_length: int = Header(None),
-            upload_offset: int = Header(None),
-            _=Depends(_get_request_chunk),
-            __=Depends(auth)
+        response: Response,
+        uuid: str,
+        content_length: int = Header(None),
+        upload_offset: int = Header(None),
+        _=Depends(_get_request_chunk),
+        __=Depends(auth),
+        on_complete: Callable[[str, dict], None] = Depends(upload_complete_dep),
     ) -> Response:
-        response_headers = _get_and_save_the_file(
+        headers = _get_and_save_the_file(
             response,
             uuid,
-            content_type,
             content_length,
-            upload_offset,
+            upload_length=upload_offset,
         )
 
-        return response_headers
+        meta = _read_metadata(uuid)
+        if meta and meta.size == meta.offset:
+            file_path = os.path.join(files_dir, uuid)
+            on_complete(file_path, meta.metadata)
+
+        return headers
 
     @router.options("/", status_code=status.HTTP_204_NO_CONTENT)
     def options_create_upload(response: Response, __=Depends(auth)) -> Response:
@@ -99,12 +142,13 @@ def create_api_router(
 
     @router.post("/", status_code=status.HTTP_201_CREATED)
     async def create_upload(
-            request: Request,
-            response: Response,
-            upload_metadata: str = Header(None),
-            upload_length: int = Header(None),
-            upload_defer_length: int = Header(None),
-            _=Depends(auth)
+        request: Request,
+        response: Response,
+        upload_metadata: str = Header(None),
+        upload_length: int = Header(None),
+        upload_defer_length: int = Header(None),
+        _=Depends(auth),
+        on_complete: Callable[[str, dict], None] = Depends(upload_complete_dep),
     ) -> Response:
         if upload_defer_length is not None and upload_defer_length != 1:
             raise HTTPException(status_code=400, detail="Invalid Upload-Defer-Length")
@@ -113,7 +157,7 @@ def create_api_router(
 
         # Create a new upload and store the file and metadata in the mapping
         metadata = {}
-        if upload_metadata is not None and upload_metadata != '':
+        if upload_metadata is not None and upload_metadata != "":
             # Decode the base64-encoded string
             for kv in upload_metadata.split(","):
                 key, value = kv.rsplit(" ", 1)
@@ -132,26 +176,24 @@ def create_api_router(
             str(date_expiry.isoformat()),
         )
         _write_metadata(saved_meta_data)
-
         _initialize_file(uuid)
 
-        chunk: bool | None = await _get_request_chunk(request, uuid, True)
-        if chunk:
-            response = _get_and_save_the_file(
-                response,
-                uuid,
-            )
-            response.headers["Location"] = f"{location}/{uuid}"
-            return response
-
-        response.headers["Location"] = f"{location}/{uuid}"
+        response.headers["Location"] = _build_location_url(request=request, uuid=uuid)
         response.headers["Tus-Resumable"] = tus_version
         response.headers["Content-Length"] = str(0)
         response.status_code = status.HTTP_201_CREATED
+
+        meta = _read_metadata(uuid)
+        if meta and meta.size == 0:
+            file_path = os.path.join(files_dir, uuid)
+            on_complete(file_path, meta.metadata)
+
         return response
 
     @router.options("/{uuid}", status_code=status.HTTP_204_NO_CONTENT)
-    def options_upload_chunk(response: Response, uuid: str, _=Depends(auth)) -> Response:
+    def options_upload_chunk(
+        response: Response, uuid: str, _=Depends(auth)
+    ) -> Response:
         meta = _read_metadata(uuid)
         if meta is None or not _file_exists(uuid):
             raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
@@ -176,10 +218,7 @@ def create_api_router(
             os.path.join(files_dir, uuid),
             media_type="application/octet-stream",
             filename=meta.metadata["name"],
-            headers={
-                "Content-Length": str(meta.offset),
-                "Tus-Resumable": tus_version
-            }
+            headers={"Content-Length": str(meta.offset), "Tus-Resumable": tus_version},
         )
 
     @router.delete("/{uuid}", status_code=status.HTTP_204_NO_CONTENT)
@@ -202,19 +241,19 @@ def create_api_router(
         if not os.path.exists(files_dir):
             os.makedirs(files_dir)
 
-        with open(os.path.join(files_dir, f'{meta.uid}.info'), 'w') as f:
+        with open(os.path.join(files_dir, f"{meta.uid}.info"), "w") as f:
             f.write(json.dumps(meta, indent=4, default=lambda k: k.__dict__))
 
     def _initialize_file(uid: str) -> None:
         if not os.path.exists(files_dir):
             os.makedirs(files_dir)
 
-        open(os.path.join(files_dir, f'{uid}'), 'a').close()
+        open(os.path.join(files_dir, f"{uid}"), "a").close()
 
     def _read_metadata(uid: str) -> FileMetadata | None:
-        fpath = os.path.join(files_dir, f'{uid}.info')
+        fpath = os.path.join(files_dir, f"{uid}.info")
         if os.path.exists(fpath):
-            with open(fpath, 'r') as f:
+            with open(fpath, "r") as f:
                 return FileMetadata(**json.load(f))
 
         return None
@@ -222,7 +261,7 @@ def create_api_router(
     def _get_file(uid: str) -> bytes | None:
         fpath = os.path.join(files_dir, uid)
         if os.path.exists(fpath):
-            with open(fpath, 'rb') as f:
+            with open(fpath, "rb") as f:
                 return f.read()
 
         return None
@@ -243,16 +282,11 @@ def create_api_router(
             os.remove(meta_path)
 
     def _get_and_save_the_file(
-            response: Response,
-            uuid: str,
-            content_type: str = Header(None),
-            content_length: int = Header(None),
-            upload_length: int = Header(None),
+        response: Response,
+        uuid: str,
+        content_length: int = Header(None),
+        upload_length: int = Header(None),
     ):
-        # Check if the Content-Type header is set to "application/offset+octet-stream"
-        if content_type != "application/offset+octet-stream":
-            raise HTTPException(status_code=415)
-
         meta = _read_metadata(uuid)
         # Check if the upload ID is valid
         if not meta or uuid != meta.uid:
@@ -272,11 +306,13 @@ def create_api_router(
 
         if meta.size == meta.offset:
             response.headers["Tus-Resumable"] = tus_version
-            response.headers["Upload-Offset"] = str(str(meta.offset) if meta.offset > 0 else str(content_length))
+            response.headers["Upload-Offset"] = str(
+                str(meta.offset) if meta.offset > 0 else str(content_length)
+            )
             response.headers["Upload-Expires"] = str(meta.expires)
             response.status_code = status.HTTP_204_NO_CONTENT
             if on_upload_complete:
-                on_upload_complete(os.path.join(files_dir, f'{uuid}'), meta.metadata)
+                on_upload_complete(os.path.join(files_dir, f"{uuid}"), meta.metadata)
 
             return response
 
@@ -300,6 +336,19 @@ def create_api_router(
             if meta.expires and datetime.fromisoformat(meta.expires) < datetime.now():
                 _delete_files(f)
 
+    def _get_host_and_proto(request: Request) -> tuple:
+        proto = "http"
+        host = request.headers.get("host")
+        if request.headers.get("X-Forwarded-Proto") is not None:
+            proto = request.headers.get("X-Forwarded-Proto")
+        if request.headers.get("X-Forwarded-Host") is not None:
+            host = request.headers.get("X-Forwarded-Host")
+        return proto, host
+
+    def _build_location_url(request: Request, uuid: str) -> str:
+        proto, host = _get_host_and_proto(request=request)
+        return f"{proto}://{host}/{prefix}/{uuid}"
+
     # # Create a scheduler for deleting the files
     # scheduler = sched.scheduler(time.time, time.sleep)
     # run_time = time.mktime(time.strptime("01:00", "%H:%M"))

tuspyserver-2.0.0/PKG-INFO

@@ -1,78 +0,0 @@
-Metadata-Version: 2.1
-Name: tuspyserver
-Version: 2.0.0
-Summary: TUS py protocol implementation in FastAPI
-Home-page: https://github.com/edihasaj/tuspy-fast-api
-Author: Edi Hasaj
-Author-email: edihasaj@outlook.com
-License: MIT
-Platform: any
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: fastapi>=0.110.0
-Requires-Dist: pydantic>=2.6.2
-
-# FastAPI Tus
-
-FastAPI Extension implementing the Tus.io server protocol
-
-### Prerequisites `FastAPI`
-
-## Installation
-
-Installation from PyPi repository (recommended for latest stable release)
-
-```
-pip install tuspyserver
-```
-
-## Usage
-
-### main.py
-
-```python
-from fastapi import FastAPI
-from starlette.middleware.cors import CORSMiddleware
-from starlette.staticfiles import StaticFiles
-
-from tusserver.tus import create_api_router
-
-app = FastAPI()
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=['*'],
-    allow_methods=["*"],
-    allow_headers=["*"],
-)
-app.mount("/static", StaticFiles(directory="static"), name="static")
-
-
-def on_upload_complete(file_path: str):
-    print('Upload complete')
-    print(file_path)
-
-
-app.include_router(
-    create_api_router(
-        files_dir='/tmp/different_dir', # OPTIONAL
-        location='http://127.0.0.1:8000/files', # OPTIONAL
-        max_size=128849018880, # OPTIONAL
-        on_upload_complete=on_upload_complete # OPTIONAL
-    ),
-    prefix="/files"
-)
-```
-
-This package has the ability to upload, download, delete (including a scheduler) files.
-
-```python setup.py sdist bdist_wheel```
-
-Any contribution is welcomed.
-
-<a href="https://www.buymeacoffee.com/edihasaj" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-red.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>

tuspyserver-2.0.0/README.md

@@ -1,58 +0,0 @@
-# FastAPI Tus
-
-FastAPI Extension implementing the Tus.io server protocol
-
-### Prerequisites `FastAPI`
-
-## Installation
-
-Installation from PyPi repository (recommended for latest stable release)
-
-```
-pip install tuspyserver
-```
-
-## Usage
-
-### main.py
-
-```python
-from fastapi import FastAPI
-from starlette.middleware.cors import CORSMiddleware
-from starlette.staticfiles import StaticFiles
-
-from tusserver.tus import create_api_router
-
-app = FastAPI()
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=['*'],
-    allow_methods=["*"],
-    allow_headers=["*"],
-)
-app.mount("/static", StaticFiles(directory="static"), name="static")
-
-
-def on_upload_complete(file_path: str):
-    print('Upload complete')
-    print(file_path)
-
-
-app.include_router(
-    create_api_router(
-        files_dir='/tmp/different_dir', # OPTIONAL
-        location='http://127.0.0.1:8000/files', # OPTIONAL
-        max_size=128849018880, # OPTIONAL
-        on_upload_complete=on_upload_complete # OPTIONAL
-    ),
-    prefix="/files"
-)
-```
-
-This package has the ability to upload, download, delete (including a scheduler) files.
-
-```python setup.py sdist bdist_wheel```
-
-Any contribution is welcomed.
-
-<a href="https://www.buymeacoffee.com/edihasaj" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-red.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>

tuspyserver-2.0.0/setup.py

@@ -1,38 +0,0 @@
-"""
-FastAPI Tus implementation
--------------
-Implements the tus.io server-side file-upload protocol
-visit https://tus.io for more information
-"""
-
-from setuptools import setup, find_packages
-
-with open('README.md', 'r') as f:
-    long_description = f.read()
-
-setup(
-    name='tuspyserver',
-    version='2.0.0',
-    description='TUS py protocol implementation in FastAPI',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    author='Edi Hasaj',
-    license='MIT',
-    author_email='edihasaj@outlook.com',
-    url='https://github.com/edihasaj/tuspy-fast-api',
-    packages=find_packages(),
-    platforms="any",
-    include_package_data=True,
-    install_requires=[
-        'fastapi>=0.110.0',
-        'pydantic>=2.6.2',
-    ],
-    classifiers=[
-        'Environment :: Web Environment',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Topic :: Software Development :: Libraries :: Python Modules'
-    ]
-)

tuspyserver-2.0.0/tuspyserver.egg-info/PKG-INFO

@@ -1,78 +0,0 @@
-Metadata-Version: 2.1
-Name: tuspyserver
-Version: 2.0.0
-Summary: TUS py protocol implementation in FastAPI
-Home-page: https://github.com/edihasaj/tuspy-fast-api
-Author: Edi Hasaj
-Author-email: edihasaj@outlook.com
-License: MIT
-Platform: any
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: fastapi>=0.110.0
-Requires-Dist: pydantic>=2.6.2
-
-# FastAPI Tus
-
-FastAPI Extension implementing the Tus.io server protocol
-
-### Prerequisites `FastAPI`
-
-## Installation
-
-Installation from PyPi repository (recommended for latest stable release)
-
-```
-pip install tuspyserver
-```
-
-## Usage
-
-### main.py
-
-```python
-from fastapi import FastAPI
-from starlette.middleware.cors import CORSMiddleware
-from starlette.staticfiles import StaticFiles
-
-from tusserver.tus import create_api_router
-
-app = FastAPI()
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=['*'],
-    allow_methods=["*"],
-    allow_headers=["*"],
-)
-app.mount("/static", StaticFiles(directory="static"), name="static")
-
-
-def on_upload_complete(file_path: str):
-    print('Upload complete')
-    print(file_path)
-
-
-app.include_router(
-    create_api_router(
-        files_dir='/tmp/different_dir', # OPTIONAL
-        location='http://127.0.0.1:8000/files', # OPTIONAL
-        max_size=128849018880, # OPTIONAL
-        on_upload_complete=on_upload_complete # OPTIONAL
-    ),
-    prefix="/files"
-)
-```
-
-This package has the ability to upload, download, delete (including a scheduler) files.
-
-```python setup.py sdist bdist_wheel```
-
-Any contribution is welcomed.
-
-<a href="https://www.buymeacoffee.com/edihasaj" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-red.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>

tuspyserver-2.0.0/tusserver/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.0.0'