yta-fastapi-docker-api 0.0.2__tar.gz → 0.0.3__tar.gz

{yta_fastapi_docker_api-0.0.2 → yta_fastapi_docker_api-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yta-fastapi-docker-api
-Version: 0.0.2
+Version: 0.0.3
 Summary: Youtube Autonomous FastAPI Docker API Module
 License-File: LICENSE
 Author: danialcala94
@@ -12,10 +12,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: fastapi (>=0.124.4,<9999.0.0)
-Requires-Dist: uvicorn (>=0.48.0,<9999.0.0)
+Requires-Dist: uvicorn (>=0.49.0,<9999.0.0)
 Requires-Dist: yta_fastapi_docker_common (>=0.0.14,<1.0.0)
-Requires-Dist: yta_fastapi_docker_pydantic_models (>=0.0.1,<1.0.0)
-Requires-Dist: yta_httpx (>=0.0.26,<1.0.0)
+Requires-Dist: yta_fastapi_docker_pydantic_models (>=0.0.5,<1.0.0)
+Requires-Dist: yta_httpx (>=0.0.27,<1.0.0)
+Requires-Dist: yta_programming_env (>=0.3.2,<1.0.0)
 Description-Content-Type: text/markdown
 
 # Youtube Autonomous FastAPI Docker API Module
@@ -55,15 +56,24 @@ No endpoints available
 
 ### VibeVoice
 
-### GET
+#### GET
 - `/vibevoice/speech`
   - `text` - The text to narrate
-  - `voice` - The voice we want to use to narrate (`en-Alice_woman`, `en-Carter_man`, `fr-Eva_woman`, etc.). Choose one voice in `demo/voices` or copy your own.
+  - `voice` - The voice we want to use to narrate. Choose one voice in `demo/voices` or copy your own.
 - `/vibevoice/audio`
   - `text` - The text to narrate
   - `voice` - The voice we want to use to narrate (`en-Alice_woman`, `en-Carter_man`, `fr-Eva_woman`, etc.) Choose one voice in `demo/voices` or copy your own.
 
-### POST
+#### POST
+No endpoints available
+
+### Proxy
+
+#### GET
+- `/proxy/image`
+  - `url` - The url to download the image from.
+
+#### POST
 No endpoints available
 
 ---

{yta_fastapi_docker_api-0.0.2 → yta_fastapi_docker_api-0.0.3}/README.md

@@ -35,15 +35,24 @@ No endpoints available
 
 ### VibeVoice
 
-### GET
+#### GET
 - `/vibevoice/speech`
   - `text` - The text to narrate
-  - `voice` - The voice we want to use to narrate (`en-Alice_woman`, `en-Carter_man`, `fr-Eva_woman`, etc.). Choose one voice in `demo/voices` or copy your own.
+  - `voice` - The voice we want to use to narrate. Choose one voice in `demo/voices` or copy your own.
 - `/vibevoice/audio`
   - `text` - The text to narrate
   - `voice` - The voice we want to use to narrate (`en-Alice_woman`, `en-Carter_man`, `fr-Eva_woman`, etc.) Choose one voice in `demo/voices` or copy your own.
 
-### POST
+#### POST
+No endpoints available
+
+### Proxy
+
+#### GET
+- `/proxy/image`
+  - `url` - The url to download the image from.
+
+#### POST
 No endpoints available
 
 ---

{yta_fastapi_docker_api-0.0.2 → yta_fastapi_docker_api-0.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "yta-fastapi-docker-api"
-version = "0.0.2"
+version = "0.0.3"
 description = "Youtube Autonomous FastAPI Docker API Module"
 authors = [
     {name = "danialcala94", email = "danielalcalavalera@gmail.com"}
@@ -10,11 +10,12 @@ requires-python = ">=3.10,<3.14"
 
 [tool.poetry.dependencies]
 # Mandatory
-yta_httpx = { version = ">=0.0.26,<1.0.0", optional = false }
+yta_httpx = { version = ">=0.0.27,<1.0.0", optional = false }
 fastapi = { version = ">=0.124.4,<9999.0.0", optional = false }
-uvicorn = { version = ">=0.48.0,<9999.0.0", optional = false }
-yta_fastapi_docker_pydantic_models = { version = ">=0.0.1,<1.0.0", optional = false }
+uvicorn = { version = ">=0.49.0,<9999.0.0", optional = false }
+yta_fastapi_docker_pydantic_models = { version = ">=0.0.5,<1.0.0", optional = false }
 yta_fastapi_docker_common = { version = ">=0.0.14,<1.0.0", optional = false }
+yta_programming_env = { version = ">=0.3.2,<1.0.0", optional = false }
 # Optional
 
 [tool.poetry]
@@ -22,7 +23,7 @@ packages = [{include = "yta_fastapi_docker_api", from = "src"}]
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.5"
-yta_testing = ">=0.3.4"
+yta_testing = ">=0.3.6"
 
 [tool.pytest.ini_options]
 markers = [

yta_fastapi_docker_api-0.0.3/src/yta_fastapi_docker_api/app/main.py

@@ -0,0 +1,28 @@
+from yta_fastapi_docker_api.app.routers import router as general_router
+from yta_fastapi_docker_api.app.routers.youtube import router as youtube_router
+from yta_fastapi_docker_api.app.routers.llamacpp import router as llamacpp_router
+from yta_fastapi_docker_api.app.routers.vibevoice import router as vibevoice_router
+from yta_fastapi_docker_api.app.routers.stock import router as stock_router
+from yta_fastapi_docker_api.app.routers.proxy import router as proxy_router
+from fastapi.middleware.cors import CORSMiddleware
+from fastapi import FastAPI
+
+
+app = FastAPI()
+
+# Added for the proxy-image endpoint
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=False,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
+# Include all the routers we have
+app.include_router(general_router)
+app.include_router(youtube_router)
+app.include_router(llamacpp_router)
+app.include_router(vibevoice_router)
+app.include_router(stock_router)
+app.include_router(proxy_router)

{yta_fastapi_docker_api-0.0.2 → yta_fastapi_docker_api-0.0.3}/src/yta_fastapi_docker_api/app/routers/__init__.py

@@ -15,6 +15,7 @@ def router_index(
         url = "/docs"
     )
 
+
 @router.get('/check-status')
 def route_check_status(
 ) -> JSONResponse:

yta_fastapi_docker_api-0.0.3/src/yta_fastapi_docker_api/app/routers/llamacpp.py

@@ -0,0 +1,31 @@
+from yta_fastapi_docker_pydantic_models.llamacpp import GemmaRequest
+from yta_fastapi_docker_common import proxy_stream_endpoint
+from yta_programming_env import Environment
+from fastapi import APIRouter
+
+
+CONTAINER_API_ENDPOINT_URL = Environment.get_env('LLAMACPP_FASTAPI_DOCKER_ENDPOINT')
+PREFIX = f'/llamacpp'
+
+router = APIRouter(
+    prefix = PREFIX
+)
+
+@router.post('/gemma4')
+async def post_llamacpp_gemma4(
+    request: GemmaRequest
+) -> 'StreamingResponse':
+    endpoint_url = f'{CONTAINER_API_ENDPOINT_URL}/llamacpp/gemma4'
+
+    payload = request.model_dump()
+
+    """
+    {'request': {'prompt': 'Hola', 'output_schema': None}}
+    """
+    return await proxy_stream_endpoint(
+        url = endpoint_url,
+        method = 'POST',
+        json = payload,
+        do_close_response = True,
+        do_close_client = True
+    )

yta_fastapi_docker_api-0.0.3/src/yta_fastapi_docker_api/app/routers/ollama.py

@@ -0,0 +1,148 @@
+# from yta_fastapi_docker_pydantic_models.ollama import Prompt
+# from yta_fastapi_docker_common import proxy_stream_endpoint
+# from yta_programming_env import Environment
+# from yta_httpx.client import HttpClient
+# from fastapi import APIRouter
+# from fastapi.responses import JSONResponse, Response
+
+
+# CONTAINER_API_ENDPOINT_URL = Environment.get_env('OLLAMA_DOCKER_ENDPOINT')
+# PREFIX = f'/ollama'
+
+# router = APIRouter(
+#     prefix = PREFIX
+# )
+
+# """
+# TODO: The 'prompt' is a class in the 'yta_fastapi_docker_ollama'
+# but I don't want to duplicate code and I'm not importing
+# any module to be able to bring it here...
+# """
+
+# @router.post('/gemma4')
+# async def post_ollama_gemma4(
+#     prompt_system: Prompt,
+#     prompt: Prompt
+# ) -> 'StreamingResponse':
+#     endpoint_url = f'{CONTAINER_API_ENDPOINT_URL}/ollama/gemma4'
+
+#     payload = {
+#         'prompt_system': prompt_system.model_dump(),
+#         'prompt': prompt.model_dump()
+#     }
+
+#     return await proxy_stream_endpoint(
+#         url = endpoint_url,
+#         method = 'POST',
+#         json = payload,
+#         do_close_response = True,
+#         do_close_client = True
+#     )
+
+# @router.post('/agents/transcription-cleaner')
+# async def post_ollama_agents_transcription_cleaner(
+#     prompt: Prompt
+# ) -> 'StreamingResponse':
+#     endpoint_url = f'{CONTAINER_API_ENDPOINT_URL}/ollama/agents/transcription-cleaner'
+    
+#     # This below if pydantic v2
+#     payload = prompt.model_dump()
+#     # This below if pydantic v1
+#     # payload = request.dict()
+
+#     return await proxy_stream_endpoint(
+#         url = endpoint_url,
+#         method = 'POST',
+#         json = payload,
+#         do_close_response = True,
+#         do_close_client = True
+#     )
+
+#     async with HttpClient(...) as http_client:
+#         response = await http_client.post.stream(
+#             url = endpoint_url,
+#             json = payload
+#         ) 
+
+#         excluded_headers = {
+#             "content-length",
+#             "transfer-encoding",
+#             "connection",
+#             "content-encoding"
+#         }
+
+#         headers = {
+#             k: v for k, v in response.headers.items()
+#             if k.lower() not in excluded_headers
+#         }
+
+#         # TODO: We need to handle errors that are not JSON
+#         content_type = resp.headers.get("content-type")
+
+#         if "application/json" in content_type:
+#             return JSONResponse(
+#                 content = resp.json(),
+#                 status_code = resp.status_code,
+#                 headers = headers
+#             )
+        
+#         """
+#         If I don't have the model it is just returning an
+#         'Internal Server Error' message, but not that we
+#         don't have the specific model...
+#         """
+#         return Response(
+#             # bytes (?)
+#             content = resp.content,
+#             status_code = resp.status_code,
+#             media_type = resp.headers.get("content-type"),
+#             headers = headers
+#         )
+    
+# """
+# This method below was not using the pydantic model
+# but was working correctly. Leave it here until the
+# one with the model is working.
+# """
+# # @router.post('/agents/transcription-cleaner')
+# # def get_agents_transcription_cleaner(
+# #     # prompt: Prompt
+# #     # prompt: str
+# #     payload: dict = Body(...)
+# # ) -> JSONResponse:
+# #     print('---')
+# #     print(payload)
+# #     print('---')
+# #     response = requests.post(
+# #         url = f'{OLLAMA_URL}/ollama/agents/transcription-cleaner',
+# #         json = payload
+# #     )
+# #     print('@@@')
+# #     print(response)
+# #     print('@@@')
+
+# #     content_type = response.headers.get("content-type", "")
+
+# #     if "application/json" in content_type:
+# #         return JSONResponse(
+# #             content = response.json(),
+# #             status_code = response.status_code
+# #         )
+    
+# #     """
+# #     If I don't have the model it is just returning an
+# #     'Internal Server Error' message, but not that we
+# #     don't have the specific model...
+# #     """
+# #     # TODO:
+# #     return Response(
+# #         # bytes (?)
+# #         content = response.content,
+# #         status_code = response.status_code,
+# #         media_type = response.headers.get("content-type")
+# #     )
+
+# #     return JSONResponse(
+# #         content = response.json(),
+# #         status_code = response.status_code
+# #     )

yta_fastapi_docker_api-0.0.3/src/yta_fastapi_docker_api/app/routers/proxy.py

@@ -0,0 +1,30 @@
+from fastapi import APIRouter
+from fastapi.responses import Response
+from yta_httpx.client import HttpClient
+
+
+PREFIX = f'/proxy'
+
+router = APIRouter(
+    prefix = PREFIX
+)
+
+
+@router.get('/image')
+async def router_proxy_image(
+    url: str
+) -> Response:
+    async with HttpClient(...) as http_client:
+        response = await http_client.get.complete(
+            url = url
+        )
+
+        content_type = response.headers.get(
+            'Content-Type',
+            'application/octet-stream'
+        )
+
+        return Response(
+            content = response.content,
+            media_type = content_type
+        )

{yta_fastapi_docker_api-0.0.2 → yta_fastapi_docker_api-0.0.3}/src/yta_fastapi_docker_api/app/routers/stock.py

@@ -1,17 +1,11 @@
+from yta_fastapi_docker_common import proxy_stream_endpoint
+from yta_programming_env import Environment
 from fastapi import APIRouter
 from fastapi.responses import StreamingResponse
-from yta_fastapi_docker_common import proxy_stream_endpoint
 from starlette.responses import StreamingResponse
 
 
-# TODO: Get this from a .env, should point to the container
-CONTAINER_API_ENDPOINT_URL = "http://yta_fastapi_docker_stock:8000"
-# CONTAINER_API_ENDPOINT_URL = "http://localhost:8002"
-"""
-This is just for manual testing when the other
-fastapi dockers are exposed.
-"""
-
+CONTAINER_API_ENDPOINT_URL = Environment.get_env('STOCK_FASTAPI_DOCKER_ENDPOINT')
 PREFIX = f'/stock'
 
 router = APIRouter(

{yta_fastapi_docker_api-0.0.2 → yta_fastapi_docker_api-0.0.3}/src/yta_fastapi_docker_api/app/routers/vibevoice.py

@@ -1,4 +1,5 @@
 from yta_fastapi_docker_common import proxy_stream_endpoint
+from yta_programming_env import Environment
 from fastapi import APIRouter
 from fastapi.responses import StreamingResponse
 from pydantic import BaseModel
@@ -13,14 +14,7 @@ class CreateVibevoiceAudio(BaseModel):
     voice: str
 
 
-# TODO: Get this from a .env, should point to the container
-CONTAINER_API_ENDPOINT_URL = 'http://yta_fastapi_docker_vibevoice:8001'
-# CONTAINER_API_ENDPOINT_URL = 'http://localhost:8001'
-"""
-This is just for manual testing when the other
-fastapi dockers are exposed.
-"""
-
+CONTAINER_API_ENDPOINT_URL = Environment.get_env('VIBEVOICE_FASTAPI_DOCKER_ENDPOINT')
 PREFIX = f'/vibevoice'
 
 router = APIRouter(

{yta_fastapi_docker_api-0.0.2 → yta_fastapi_docker_api-0.0.3}/src/yta_fastapi_docker_api/app/routers/youtube.py

@@ -1,17 +1,11 @@
-from fastapi import APIRouter
 from yta_fastapi_docker_common import proxy_stream_endpoint
+from yta_programming_env import Environment
+from fastapi import APIRouter
 from yta_httpx.client import HttpClient
 from fastapi.responses import StreamingResponse, JSONResponse
 
 
-# TODO: Get this from a .env, should point to the container
-CONTAINER_API_ENDPOINT_URL = 'http://yta_fastapi_docker_youtube:8000'
-# CONTAINER_API_ENDPOINT_URL = 'http://localhost:8002'
-"""
-This is just for manual testing when the other
-fastapi dockers are exposed.
-"""
-
+CONTAINER_API_ENDPOINT_URL = Environment.get_env('YOUTUBE_FASTAPI_DOCKER_ENDPOINT')
 PREFIX = f'/youtube'
 
 router = APIRouter(

yta_fastapi_docker_api-0.0.2/src/yta_fastapi_docker_api/app/main.py

@@ -1,17 +0,0 @@
-from yta_fastapi_docker_api.app.routers import router as general_router
-from yta_fastapi_docker_api.app.routers.youtube import router as youtube_router
-from yta_fastapi_docker_api.app.routers.ollama import router as ollama_router
-from yta_fastapi_docker_api.app.routers.vibevoice import router as vibevoice_router
-from yta_fastapi_docker_api.app.routers.stock import router as stock_router
-from fastapi import FastAPI
-
-
-app = FastAPI()
-
-# Include all the routers we have
-app.include_router(general_router)
-app.include_router(youtube_router)
-# TODO: By now ollama needs more work to be stable
-# app.include_router(ollama_router)
-app.include_router(vibevoice_router)
-app.include_router(stock_router)

yta_fastapi_docker_api-0.0.2/src/yta_fastapi_docker_api/app/routers/ollama.py

@@ -1,126 +0,0 @@
-from yta_fastapi_docker_pydantic_models.ollama import Prompt
-from fastapi import APIRouter, Body
-from fastapi.responses import JSONResponse, Response
-
-# import requests
-
-
-# TODO: Get this from a .env, should point to the container
-CONTAINER_API_ENDPOINT_URL = 'http://yta_fastapi_docker_ollama:8000'
-CONTAINER_API_ENDPOINT_URL = "http://localhost:8002"
-"""
-This is just for manual testing when the other
-fastapi dockers are exposed.
-"""
-
-PREFIX = f'/ollama'
-
-router = APIRouter(
-    prefix = PREFIX
-)
-
-"""
-TODO: The 'prompt' is a class in the 'yta_fastapi_docker_ollama'
-but I don't want to duplicate code and I'm not importing
-any module to be able to bring it here...
-"""
-
-@router.post('/agents/transcription-cleaner')
-def get_agents_transcription_cleaner(
-    prompt: Prompt
-) -> JSONResponse:
-    endpoint_url = f'{CONTAINER_API_ENDPOINT_URL}/ollama/agents/transcription-cleaner'
-    
-    # This below if pydantic v2
-    payload = prompt.model_dump()
-    # This below if pydantic v1
-    # payload = request.dict()     
-
-    resp = requests.post(
-        url = endpoint_url,
-        json = payload,
-        stream = True
-    )
-
-    excluded_headers = {
-        "content-length",
-        "transfer-encoding",
-        "connection",
-        "content-encoding"
-    }
-
-    headers = {
-        k: v for k, v in resp.headers.items()
-        if k.lower() not in excluded_headers
-    }
-
-    # TODO: We need to handle errors that are not JSON
-    content_type = resp.headers.get("content-type")
-
-    if "application/json" in content_type:
-        return JSONResponse(
-            content = resp.json(),
-            status_code = resp.status_code,
-            headers = headers
-        )
-    
-    """
-    If I don't have the model it is just returning an
-    'Internal Server Error' message, but not that we
-    don't have the specific model...
-    """
-    return Response(
-        # bytes (?)
-        content = resp.content,
-        status_code = resp.status_code,
-        media_type = resp.headers.get("content-type"),
-        headers = headers
-    )
-    
-"""
-This method below was not using the pydantic model
-but was working correctly. Leave it here until the
-one with the model is working.
-"""
-# @router.post('/agents/transcription-cleaner')
-# def get_agents_transcription_cleaner(
-#     # prompt: Prompt
-#     # prompt: str
-#     payload: dict = Body(...)
-# ) -> JSONResponse:
-#     print('---')
-#     print(payload)
-#     print('---')
-#     response = requests.post(
-#         url = f'{OLLAMA_URL}/ollama/agents/transcription-cleaner',
-#         json = payload
-#     )
-#     print('@@@')
-#     print(response)
-#     print('@@@')
-
-#     content_type = response.headers.get("content-type", "")
-
-#     if "application/json" in content_type:
-#         return JSONResponse(
-#             content = response.json(),
-#             status_code = response.status_code
-#         )
-    
-#     """
-#     If I don't have the model it is just returning an
-#     'Internal Server Error' message, but not that we
-#     don't have the specific model...
-#     """
-#     # TODO:
-#     return Response(
-#         # bytes (?)
-#         content = response.content,
-#         status_code = response.status_code,
-#         media_type = response.headers.get("content-type")
-#     )
-
-#     return JSONResponse(
-#         content = response.json(),
-#         status_code = response.status_code
-#     )