pyxecm 3.0.1__py3-none-any.whl → 3.1.1__py3-none-any.whl

pyxecm_api/common/functions.py

@@ -5,6 +5,7 @@ import os
 from typing import Annotated
 
 from fastapi import Depends
+from pyxecm.otca import OTCA
 from pyxecm.otcs import OTCS
 from pyxecm_customizer import K8s, PayloadList, Settings
 
@@ -31,12 +32,14 @@ def get_k8s_object() -> K8s:
 
 
 def get_otcs_object() -> OTCS:
-    """Get an instance of a K8s object.
+    """Get an instance of a Content Server (OTCS) object.
 
     Returns:
-        K8s: Return a K8s object
+        OTCS:
+            Return a new OTCS object.
 
     """
+
     settings = Settings()
 
     otcs = OTCS(
@@ -52,27 +55,34 @@ def get_otcs_object() -> OTCS:
         support_path=settings.otcs.support_path,
         download_dir=settings.otcs.download_dir,
         feme_uri=settings.otcs.feme_uri,
-        logger=logger.getChild("otcs"),
+        logger=logger,
     )
 
+    # Authenticate at Content Server:
     otcs.authenticate()
 
     return otcs
 
 
-def get_otcs_object_from_otcsticket(otcsticket: Annotated[str, Depends(get_otcsticket)]) -> OTCS:
-    """Get an instance of a K8s object.
+def get_otcs_object_from_otcsticket(otcs_ticket: Annotated[str, Depends(get_otcsticket)]) -> OTCS:
+    """Get an instance of a Content Server (OTCS) object.
 
     Returns:
-        K8s: Return a K8s object
+        OTCS:
+            Return an OTCS object.
 
     """
+
     settings = Settings()
 
+    # Create an OTCS object without defining the username and password:
     otcs = OTCS(
-        protocol=settings.otcs.url_backend.scheme,
-        hostname=settings.otcs.url_backend.host,
-        port=settings.otcs.url_backend.port,
+        # protocol=settings.otcs.url_backend.scheme,
+        # hostname=settings.otcs.url_backend.host,
+        # port=settings.otcs.url_backend.port,
+        protocol=settings.otcs.url_frontend.scheme,
+        hostname=settings.otcs.url_frontend.host,
+        port=settings.otcs.url_frontend.port,
         public_url=str(settings.otcs.url),
         user_partition=settings.otcs.partition,
         resource_name=settings.otcs.resource_name,
@@ -80,19 +90,62 @@ def get_otcs_object_from_otcsticket(otcsticket: Annotated[str, Depends(get_otcst
         support_path=settings.otcs.support_path,
         download_dir=settings.otcs.download_dir,
         feme_uri=settings.otcs.feme_uri,
-        logger=logger.getChild("otcs"),
+        logger=logger,
     )
 
-    otcs._otcs_ticket = otcsticket  # noqa: SLF001
+    # Instead set the OTCS authentication ticket directly:
+    otcs._otcs_ticket = otcs_ticket  # noqa: SLF001
 
     return otcs
 
 
+def get_otca_object(otcs_object: OTCS | None = None) -> OTCA:
+    """Get the Content Aviator (OTCA) object.
+
+    Args:
+        otcs_object (OTCS | None, optional):
+            The Content Server (OTCS) object. Defaults to None.
+
+    Returns:
+        OTCA:
+            The new Content Aviator object.
+
+    """
+
+    settings = Settings()
+
+    # Get the Kubernetes object:
+    k8s_object = get_k8s_object()
+    content_system = {}
+    # Read the content system (e.g. OTCM) from the Kubernetes Config Map:
+    for service in ["chat", "embed"]:
+        cm = k8s_object.get_config_map(f"csai-{service}-svc")
+        if cm:
+            content_system[service] = cm.data.get("CONTENT_SYSTEM", "none")
+            logger.info("Set content system for '%s' to -> '%s'.", service, content_system[service])
+
+    # Create the Content Aviator object (OTCA class):
+    otca = OTCA(
+        chat_url=str(settings.aviator.chat_svc_url),
+        embed_url=str(settings.aviator.embed_svc_url),
+        studio_url=str(settings.aviator.studio_url),
+        otds_url=str(settings.otds.url_internal),
+        client_id=settings.aviator.oauth_client,
+        client_secret=settings.aviator.oauth_secret,
+        otcs_object=otcs_object,
+        content_system=content_system,
+        logger=logger.getChild("otca"),
+    )
+
+    return otca
+
+
 def get_settings() -> CustomizerAPISettings:
     """Get the API Settings object.
 
     Returns:
-        CustomizerPISettings: Returns the API Settings
+        CustomizerPISettings:
+            Returns the API Settings.
 
     """
 
@@ -112,6 +165,7 @@ def get_otcs_logs_lock() -> dict:
 
 def list_files_in_directory(directory: str) -> dict:
     """Recursively list files in a directory and return a nested JSON structure with URLs."""
+
     result = {}
     for root, dirs, files in os.walk(directory):
         # Sort directories and files alphabetically
@@ -128,4 +182,5 @@ def list_files_in_directory(directory: str) -> dict:
         for file in files:
             file_path = os.path.join(relative_path, file)
             current_level[file] = file_path
+
     return result

pyxecm_api/settings.py

@@ -56,9 +56,6 @@ class CustomizerAPISettings(BaseSettings):
     )
 
     loglevel: Literal["INFO", "DEBUG", "WARNING", "ERROR"] = "INFO"
-    log_payload_processing: bool = Field(
-        default=False, description="Print the customizer payload processing log messages to stdout"
-    )
     logfolder: str = Field(
         default=os.path.join(tempfile.gettempdir(), "customizer"),
         description="Logfolder for Customizer logfiles",
@@ -122,11 +119,6 @@ class CustomizerAPISettings(BaseSettings):
         description="Prefix for the CSAI",
     )
 
-    csai_studio_integration: bool = Field(
-        default=False,
-        description="Enable the CSAI Studio Integration",
-    )
-
     upload_folder: str = Field(default=os.path.join(tempfile.gettempdir(), "upload"), description="Folder for uploads")
 
     upload_key: str = Field(default=str(uuid.uuid4()), description="Upload key for the Logs")

pyxecm_api/terminal/router.py

@@ -93,7 +93,7 @@ async def ws_terminal(
         read_task = asyncio.create_task(read_from_pty())
         write_task = asyncio.create_task(write_to_pty())
 
-        done, pending = await asyncio.wait([read_task, write_task], return_when=asyncio.FIRST_COMPLETED)
+        _done, pending = await asyncio.wait([read_task, write_task], return_when=asyncio.FIRST_COMPLETED)
 
         # Cancel other task
         for task in pending:

pyxecm_api/v1_csai/router.py

@@ -4,15 +4,14 @@ import logging
 from http import HTTPStatus
 from typing import Annotated
 
-from fastapi import APIRouter, Body, Depends, Query
+from fastapi import APIRouter, Body, Depends, HTTPException, Query
 from fastapi.responses import HTMLResponse, JSONResponse
 from pyxecm.otcs import OTCS
 from pyxecm_customizer.k8s import K8s
 
-from pyxecm_api.agents.functions import get_otca_object
 from pyxecm_api.auth.functions import get_authorized_user
 from pyxecm_api.auth.models import User
-from pyxecm_api.common.functions import get_k8s_object, get_otcs_object, get_settings
+from pyxecm_api.common.functions import get_k8s_object, get_otca_object, get_otcs_object, get_settings
 from pyxecm_api.settings import CustomizerAPISettings
 
 from .models import CSAIEmbedMetadata
@@ -31,12 +30,16 @@ def embed_metadata(
     """Embed the Metadata of the given objects.
 
     Args:
-        user (Annotated[User, Depends): User required for authentication
-        otcs_object (Annotated[OTCS, Depends(get_otcs_object)]): OTCS object to interact with OTCS
-        body (Annotated[CSAIEmbedMetadata, Body): Request body
+        user (Annotated[User, Depends):
+            User required for authentication.
+        otcs_object (Annotated[OTCS, Depends(get_otcs_object)]):
+            The OTCS object to interact with OTCM (Content Server).
+        body (Annotated[CSAIEmbedMetadata, Body):
+            The request body.
 
     Returns:
-        JSONResponse: JSONResponse with success=true/false
+        JSONResponse:
+            JSONResponse with success=true/false
 
     """
 
@@ -53,7 +56,7 @@ def get_csai_config_data(
 ) -> JSONResponse:
     """Get the csai config data."""
 
-    logger.info("READ csai config data by user -> %s", user.id)
+    logger.info("Read CSAI config data by user -> %s", user.id)
 
     config_data = {}
 
@@ -79,9 +82,9 @@ def set_csai_config_data(
     k8s_object: Annotated[K8s, Depends(get_k8s_object)],
     config: Annotated[dict, Body()],
 ) -> JSONResponse:
-    """Get the csai config data."""
+    """Set the CSAI config data."""
 
-    logger.info("READ csai config data by user -> %s", user.id)
+    logger.info("Write CSAI config data by user -> %s", user.id)
 
     for config_map in config:
         if not config_map.startswith(settings.csai_prefix):
@@ -115,27 +118,39 @@ def set_csai_config_data(
 
 
 @router.get("/graph")
-def get_csai_graph(name: Annotated[str, Query(..., description="Name of the Graph")]) -> HTMLResponse:
+def get_csai_graph(name: Annotated[str, Query(..., description="Name of the graph")]) -> HTMLResponse:
     """Display the graph of the given name.
 
     Args:
-        otca (Annotated[OTCA, Depends): Generic OTCA Objec
-        name (str): name of the graph
+        name (str):
+            The name of the CSAI graph.
 
     Returns:
-        HTMLResponse: _description_
+        HTMLResponse: Visualization of the CSAI graph
 
     """
+
+    # Get the Content Aviator object:
     otca = get_otca_object(otcs_object=None)
 
+    # Get all graphs configured in Content Aviator:
     graphs = otca.get_graphs()
+    # Find the graph (LangGraph) with the given name:
     graph = [g for g in graphs if g["name"] == name]
 
-    if graph:
+    if not graph:
+        logger.error("Couldn't find graph -> '%s' for visualization!", name)
+        raise HTTPException(status_code=404, detail="Graph -> '{}' not found!".format(name))
+
+    try:
         filename = otca.visualize_graph(graph[0]["id"])
 
-    with open(filename) as f:
-        file_content = f.read()
+        with open(filename) as f:
+            file_content = f.read()
+    except Exception as e:
+        logger.error("Error visualizing graph -> '%s': %s", name, str(e))
+        raise HTTPException(status_code=500, detail="Failed to visualize graph -> '{}'!".format(name)) from e
+
+    logger.info("Successfully visualized graph -> '%s'", name)
 
-    logger.info("name: %s", name)
     return HTMLResponse(status_code=200, content=file_content)