pyxecm 2.0.3__py3-none-any.whl → 3.0.0__py3-none-any.whl

pyxecm_api/v1_maintenance/__init__.py

@@ -0,0 +1 @@
+"""init module."""

{pyxecm/customizer/api → pyxecm_api}/v1_maintenance/functions.py

@@ -7,10 +7,10 @@ from http import HTTPStatus
 import yaml
 from fastapi import HTTPException
 from pydantic import HttpUrl, ValidationError
+from pyxecm_customizer.k8s import K8s
+from pyxecm_maintenance_page.settings import settings as maint_settings
 
-from pyxecm.customizer.api.v1_maintenance.models import MaintenanceModel
-from pyxecm.customizer.k8s import K8s
-from pyxecm.maintenance_page.settings import settings as maint_settings
+from pyxecm_api.v1_maintenance.models import MaintenanceModel
 
 logger = logging.getLogger("v1_maintenance.functions")
 

{pyxecm/customizer/api → pyxecm_api}/v1_maintenance/router.py

@@ -4,18 +4,18 @@ import logging
 from typing import Annotated
 
 from fastapi import APIRouter, Depends, Form
+from pyxecm_customizer.k8s import K8s
+from pyxecm_maintenance_page.settings import settings as maint_settings
 
-from pyxecm.customizer.api.auth import models
-from pyxecm.customizer.api.auth.functions import get_authorized_user
-from pyxecm.customizer.api.common.functions import get_k8s_object
-from pyxecm.customizer.api.v1_maintenance.functions import get_maintenance_mode_status, set_maintenance_mode_via_ingress
-from pyxecm.customizer.api.v1_maintenance.models import MaintenanceModel
-from pyxecm.customizer.k8s import K8s
-from pyxecm.maintenance_page.settings import settings as maint_settings
+from pyxecm_api.auth import models
+from pyxecm_api.auth.functions import get_authorized_user
+from pyxecm_api.common.functions import get_k8s_object
+from pyxecm_api.v1_maintenance.functions import get_maintenance_mode_status, set_maintenance_mode_via_ingress
+from pyxecm_api.v1_maintenance.models import MaintenanceModel
 
 router = APIRouter(prefix="/api/v1/maintenance", tags=["maintenance"])
 
-logger = logging.getLogger("pyxecm.customizer.api.v1_maintenance")
+logger = logging.getLogger("pyxecm_api.v1_maintenance")
 
 
 @router.get(path="")

pyxecm_api/v1_otcs/__init__.py

@@ -0,0 +1 @@
+"""init module."""

{pyxecm/customizer/api → pyxecm_api}/v1_otcs/functions.py

@@ -1,24 +1,24 @@
 """Define functions for v1_otcs."""
 
 import logging
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from threading import Lock
 
 from fastapi import APIRouter
+from pyxecm_customizer.k8s import K8s
 
-from pyxecm.customizer.api.settings import CustomizerAPISettings
-from pyxecm.customizer.k8s import K8s
+from pyxecm_api.settings import CustomizerAPISettings
 
 router = APIRouter(prefix="/api/v1/otcs", tags=["otcs"])
 
-logger = logging.getLogger("pyxecm.customizer.api.v1_otcs")
+logger = logging.getLogger("pyxecm_api.v1_otcs")
 
 
 def collect_otcs_logs(host: str, k8s_object: K8s, logs_lock: Lock, settings: CustomizerAPISettings) -> None:
     """Collect the logs for the given OTCS instance."""
 
     with logs_lock:
-        timestamp = datetime.now(tz=timezone.utc).strftime("%Y-%m-%d_%H-%M")
+        timestamp = datetime.now(tz=UTC).strftime("%Y-%m-%d_%H-%M")
         tgz_file = f"/tmp/{timestamp}_{host}.tar.gz"  # noqa: S108
 
         if host.startswith("otcs-frontend"):
@@ -27,6 +27,8 @@ def collect_otcs_logs(host: str, k8s_object: K8s, logs_lock: Lock, settings: Cus
             container = "otcs-backend-search-container"
         elif host.startswith("otcs-admin"):
             container = "otcs-admin-container"
+        elif host.startswith("otcs-da"):
+            container = "otcs-da-container"
         else:
             container = None
 

{pyxecm/customizer/api → pyxecm_api}/v1_otcs/router.py

@@ -10,17 +10,18 @@ from typing import Annotated
 import anyio
 from fastapi import APIRouter, Body, Depends, File, HTTPException, UploadFile
 from fastapi.responses import FileResponse, JSONResponse
+from pyxecm_customizer.k8s import K8s
 
-from pyxecm.customizer.api.auth.functions import get_authorized_user
-from pyxecm.customizer.api.auth.models import User
-from pyxecm.customizer.api.common.functions import get_k8s_object, get_otcs_logs_lock, get_settings
-from pyxecm.customizer.api.settings import CustomizerAPISettings
-from pyxecm.customizer.api.v1_otcs.functions import collect_otcs_logs
-from pyxecm.customizer.k8s import K8s
+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_logs_lock, get_settings
+from pyxecm_api.settings import CustomizerAPISettings
+
+from .functions import collect_otcs_logs
 
 router = APIRouter(prefix="/api/v1/otcs", tags=["otcs"])
 
-logger = logging.getLogger("pyxecm.customizer.api.v1_otcs")
+logger = logging.getLogger("pyxecm_api.v1_otcs")
 
 
 @router.put(path="/logs", tags=["otcs"])
@@ -35,10 +36,15 @@ async def put_otcs_logs(
 
     if "all" in hosts:
         hosts = []
-        for sts in ["otcs-admin", "otcs-frontend", "otcs-backend-search"]:
+        for sts in ["otcs-admin", "otcs-frontend", "otcs-backend-search", "otcs-da"]:
             try:
-                sts_replicas = k8s_object.get_stateful_set_scale(sts).status.replicas
-                hosts.extend([f"{sts}-{i}" for i in range(sts_replicas)])
+                sts_replicas = k8s_object.get_stateful_set_scale(sts)
+
+                if sts_replicas is None:
+                    logger.debug("Cannot get statefulset {sts}")
+                    continue
+
+                hosts.extend([f"{sts}-{i}" for i in range(sts_replicas.status.replicas)])
             except Exception as e:
                 raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR) from e
 
@@ -118,10 +124,15 @@ async def get_otcs_log_files(
     response = {"status": {host: bool(otcs_logs_lock[host].locked()) for host in otcs_logs_lock}, "files": files}
 
     # Extend response with all hosts
-    for sts in ["otcs-admin", "otcs-frontend", "otcs-backend-search"]:
+    for sts in ["otcs-admin", "otcs-frontend", "otcs-backend-search", "otcs-da"]:
         try:
-            sts_replicas = k8s_object.get_stateful_set_scale(sts).status.replicas
-            for i in range(sts_replicas):
+            sts_replicas = k8s_object.get_stateful_set_scale(sts)
+
+            if sts_replicas is None:
+                logger.debug("Cannot get statefulset {sts}")
+                continue
+
+            for i in range(sts_replicas.status.replicas):
                 host = f"{sts}-{i}"
 
                 if host in otcs_logs_lock:

pyxecm_api/v1_payload/__init__.py

@@ -0,0 +1 @@
+"""init module."""

{pyxecm/customizer/api → pyxecm_api}/v1_payload/functions.py

@@ -12,13 +12,14 @@ import os
 from collections.abc import AsyncGenerator
 
 import anyio
+from pyxecm.helper.otel_config import tracer
+from pyxecm_customizer.exceptions import PayloadImportError
+from pyxecm_customizer.payload import load_payload
 
-from pyxecm.customizer.api.common.functions import PAYLOAD_LIST
-from pyxecm.customizer.api.settings import api_settings
-from pyxecm.customizer.exceptions import PayloadImportError
-from pyxecm.customizer.payload import load_payload
+from pyxecm_api.common.functions import PAYLOAD_LIST
+from pyxecm_api.settings import api_settings
 
-logger = logging.getLogger("pyxecm.customizer.api.v1_payload")
+logger = logging.getLogger("pyxecm_api.v1_payload")
 
 # Initialize the globel Payloadlist object
 
@@ -141,7 +142,9 @@ def import_payload(
 
     for filename in sorted(os.listdir(payload_dir)):
         try:
-            import_payload_file(os.path.join(payload_dir, filename), enabled, dependencies)
+            with tracer.start_as_current_span("import_payload") as t:
+                t.set_attribute("payload", filename)
+                import_payload_file(os.path.join(payload_dir, filename), enabled, dependencies)
         except PayloadImportError as exc:
             logger.error(exc)
             logger.debug(exc, exc_info=True)
@@ -166,7 +169,7 @@ def prepare_dependencies(dependencies: list) -> list | None:
     return converted_list
 
 
-async def tail_log(file_path: str) -> AsyncGenerator[str, None]:
+async def tail_log(file_path: str) -> AsyncGenerator[str]:
     """Asynchronously follow the log file like `tail -f`."""
     try:
         async with await anyio.open_file(file_path) as file:

{pyxecm/customizer/api → pyxecm_api}/v1_payload/router.py

@@ -6,24 +6,25 @@ import json
 import logging
 import os
 import shutil
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from http import HTTPStatus
 from typing import Annotated, Literal
 
 from fastapi import APIRouter, Depends, File, Form, HTTPException, UploadFile
 from fastapi.responses import FileResponse, JSONResponse, Response, StreamingResponse
+from pyxecm_customizer.payload import load_payload
 
-from pyxecm.customizer.api.auth.functions import get_authorized_user
-from pyxecm.customizer.api.auth.models import User
-from pyxecm.customizer.api.common.functions import PAYLOAD_LIST, get_settings
-from pyxecm.customizer.api.settings import CustomizerAPISettings
-from pyxecm.customizer.api.v1_payload.functions import prepare_dependencies, tail_log
-from pyxecm.customizer.api.v1_payload.models import PayloadListItem, PayloadListItems, UpdatedPayloadListItem
-from pyxecm.customizer.payload import load_payload
+from pyxecm_api.auth.functions import get_authorized_user
+from pyxecm_api.auth.models import User
+from pyxecm_api.common.functions import PAYLOAD_LIST, get_settings
+from pyxecm_api.settings import CustomizerAPISettings
+
+from .functions import prepare_dependencies, tail_log
+from .models import PayloadListItem, PayloadListItems, UpdatedPayloadListItem
 
 router = APIRouter(prefix="/api/v1/payload", tags=["payload"])
 
-logger = logging.getLogger("pyxecm.customizer.api.v1_payload")
+logger = logging.getLogger("pyxecm_api.v1_payload")
 
 
 @router.post(path="")
@@ -255,7 +256,7 @@ async def update_payload_item(
                 payload_id,
             )
 
-            now = datetime.now(timezone.utc)
+            now = datetime.now(UTC)
             old_log_name = (
                 os.path.dirname(data.logfile)
                 + "/"

{pyxecm/customizer → pyxecm_customizer}/__init__.py

@@ -1,13 +1,17 @@
 """PYXECM classes for Customizer."""
 
+from .__main__ import main
 from .browser_automation import BrowserAutomation
 from .customizer import Customizer
 from .k8s import K8s
+from .knowledge_graph import KnowledgeGraph
 from .m365 import M365
 from .payload import Payload
+from .payload_list import PayloadList
 from .salesforce import Salesforce
 from .sap import SAP
 from .servicenow import ServiceNow
+from .settings import Settings
 from .successfactors import SuccessFactors
 
 __all__ = [
@@ -17,8 +21,12 @@ __all__ = [
     "Customizer",
     "Guidewire",
     "K8s",
+    "KnowledgeGraph",
     "Payload",
+    "PayloadList",
     "Salesforce",
     "ServiceNow",
+    "Settings",
     "SuccessFactors",
+    "main",
 ]

{pyxecm/customizer → pyxecm_customizer}/__main__.py

@@ -10,20 +10,29 @@ import logging
 import os
 import sys
 
-from pyxecm.customizer import Customizer
-from pyxecm.customizer.payload import load_payload
+from .customizer import Customizer
+from .payload import load_payload
 
 logger = logging.getLogger("customizer")
 
 
-def main(argv: list[str]) -> int:
+def main() -> int:
     """Start the Customizer."""
 
-    if len(argv) < 2:
+    logging.basicConfig(
+        format="%(asctime)s %(levelname)s [%(name)s] %(message)s",
+        datefmt="%d-%b-%Y %H:%M:%S",
+        level=logging.INFO,
+        handlers=[
+            logging.StreamHandler(sys.stdout),
+        ],
+    )
+
+    if len(sys.argv) < 2:
         logger.error("No input file specified")
         sys.exit(1)
 
-    payload_filename = argv[1]
+    payload_filename = sys.argv[1]
 
     if not os.path.isfile(payload_filename):
         logger.error("Input file does not exist")
@@ -37,22 +46,7 @@ def main(argv: list[str]) -> int:
 
     my_customizer = Customizer(logger=logger, settings=customizer_settings)
 
-    my_customizer.customization_run()
-
-    return 0
-
-
-if __name__ == "__main__":
-    logging.basicConfig(
-        format="%(asctime)s %(levelname)s [%(name)s] %(message)s",
-        datefmt="%d-%b-%Y %H:%M:%S",
-        level=logging.INFO,
-        handlers=[
-            logging.StreamHandler(sys.stdout),
-        ],
-    )
-
     try:
-        main(sys.argv)
+        my_customizer.customization_run()
     except KeyboardInterrupt:
         logger.warning("KeyboardInterrupt - exiting")