dc-python-sdk 1.5.20__tar.gz → 1.5.22__tar.gz

{dc_python_sdk-1.5.20/src/dc_python_sdk.egg-info → dc_python_sdk-1.5.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dc-python-sdk
-Version: 1.5.20
+Version: 1.5.22
 Summary: Data Connector Python SDK
 Home-page: https://github.com/data-connector/dc-python-sdk
 Author: DataConnector

{dc_python_sdk-1.5.20 → dc_python_sdk-1.5.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dc-python-sdk"
-version = "1.5.20"
+version = "1.5.22"
 description = "Data Connector Python SDK"
 readme = "README.md"
 requires-python = ">=3.6"

{dc_python_sdk-1.5.20 → dc_python_sdk-1.5.22}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = dc-python-sdk
-version = 1.5.20
+version = 1.5.22
 author = DataConnector
 author_email = josh@dataconnector.com
 description = A small example package

{dc_python_sdk-1.5.20 → dc_python_sdk-1.5.22/src/dc_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dc-python-sdk
-Version: 1.5.20
+Version: 1.5.22
 Summary: Data Connector Python SDK
 Home-page: https://github.com/data-connector/dc-python-sdk
 Author: DataConnector

{dc_python_sdk-1.5.20 → dc_python_sdk-1.5.22}/src/dc_sdk/cli.py

@@ -1,6 +1,13 @@
 import sys
 from importlib.metadata import version
 
+def get_arg(name, default=None):
+    if name in sys.argv:
+        idx = sys.argv.index(name)
+        if idx + 1 < len(sys.argv):
+            return sys.argv[idx + 1]
+    return default
+
 def main():
     if len(sys.argv) < 2:
         print("Usage: dc-sdk [http|ai|ai-http]")
@@ -8,13 +15,15 @@ def main():
 
     command = sys.argv[1]
 
+    port = int(get_arg("--port", 5000))
+
     print("version: ", version("dc-python-sdk"))
 
     print(f"[DC SDK] Command: {command}")
 
     if command == "http":
         from dc_sdk.src.server import start_server
-        start_server()
+        start_server(port)
 
     elif command == "ai":
         from dc_sdk.src.ai import start_ai
@@ -22,7 +31,7 @@ def main():
 
     elif command == "ai-http":
         from dc_sdk.src.ai_http import start_ai_http
-        start_ai_http()
+        start_ai_http(connector_port=port)
     
     else:
         print(f"Unknown command: {command}")

{dc_python_sdk-1.5.20 → dc_python_sdk-1.5.22}/src/dc_sdk/src/ai_http.py

@@ -10,6 +10,7 @@ from openai import OpenAI
 import atexit
 import signal
 import shutil
+import threading
 
 logger = logging.getLogger(__name__)
 
@@ -19,6 +20,12 @@ app = FastAPI()
 
 client = None
 workspace = os.getenv("WORKSPACE", "/workspace")
+port_for_connector = 5000
+
+# Process-wide TTL for ai-http (see DC_SDK_TTL_SECONDS); exposed in /session-info.
+process_ttl_seconds: Optional[float] = None
+process_ttl_deadline_unix: Optional[float] = None
+_process_ttl_timer: Optional[threading.Timer] = None
 
 # -----------------------------
 # MODELS
@@ -70,12 +77,39 @@ def get_free_port():
     return port
 
 
+_DEFAULT_PROCESS_TTL_SECONDS = 600.0
+
+
+def _parse_process_ttl_seconds() -> float:
+    """
+    Wall-clock lifetime for the whole ai-http process from start_ai_http() entry.
+    Env DC_SDK_TTL_SECONDS: positive seconds; unset or empty → 600 (10m); 0 → disabled.
+    """
+    raw = os.environ.get("DC_SDK_TTL_SECONDS")
+    if raw is None:
+        return _DEFAULT_PROCESS_TTL_SECONDS
+    raw = raw.strip()
+    if raw == "":
+        return _DEFAULT_PROCESS_TTL_SECONDS
+    try:
+        v = float(raw)
+    except ValueError:
+        logger.warning(
+            "Invalid DC_SDK_TTL_SECONDS=%r; using default %s",
+            raw,
+            _DEFAULT_PROCESS_TTL_SECONDS,
+        )
+        return _DEFAULT_PROCESS_TTL_SECONDS
+    if v <= 0:
+        return 0.0
+    return v
+
+
 def start_connector():
     global workspace
-    port = int(os.getenv("PORT", 6060))
-
+    global port_for_connector
     proc = subprocess.Popen(
-        ["dc-sdk", "http"],
+        ["dc-sdk", "http", "--port", str(port_for_connector)],
         cwd=workspace,
         stdout=subprocess.DEVNULL,
         stderr=subprocess.DEVNULL
@@ -84,15 +118,15 @@ def start_connector():
     # wait for health
     for _ in range(50):
         try:
-            res = requests.get(f"http://localhost:{port}/health")
+            res = requests.get(f"http://localhost:{port_for_connector}/health")
             if res.status_code == 200:
-                logger.info("Connector ready on port %s", port)
-                return {"process": proc, "port": port}
+                logger.info("Connector ready on port %s", port_for_connector)
+                return {"process": proc, "port": port_for_connector}
         except Exception:
-            logger.debug("Health check not ready yet on port %s", port)
+            logger.debug("Health check not ready yet on port %s", port_for_connector)
         time.sleep(0.1)
 
-    logger.error("Connector failed to become healthy on port %s within timeout", port)
+    logger.error("Connector failed to become healthy on port %s within timeout", port_for_connector)
     proc.terminate()
     raise Exception("Failed to start connector")
 
@@ -704,9 +738,52 @@ def clone_repo():
     subprocess.run(["git", "-C", workspace, "checkout", branch], check=True)
     subprocess.run(["git", "-C", workspace, "pull"], check=True)
 
-def start_ai_http():
+def start_ai_http(connector_port=5000):
     global client
     global workspace
+    global port_for_connector
+    global process_ttl_seconds
+    global process_ttl_deadline_unix
+    global _process_ttl_timer
+
+    port_for_connector = connector_port
+
+    process_ttl_seconds = None
+    process_ttl_deadline_unix = None
+    _process_ttl_timer = None
+
+    ttl_sec = _parse_process_ttl_seconds()
+    ttl_shutdown_holder: Dict[str, Any] = {"fn": None}
+
+    if ttl_sec > 0:
+        process_ttl_seconds = ttl_sec
+        process_ttl_deadline_unix = time.time() + ttl_sec
+
+        def on_process_ttl():
+            logger.warning(
+                "DC_SDK_TTL_SECONDS (%s s) elapsed; stopping and exiting process",
+                ttl_sec,
+            )
+            fn = ttl_shutdown_holder.get("fn")
+            if callable(fn):
+                try:
+                    fn()
+                except Exception:
+                    logger.exception("Process TTL shutdown hook failed")
+            os._exit(0)
+
+        _process_ttl_timer = threading.Timer(ttl_sec, on_process_ttl)
+        _process_ttl_timer.daemon = True
+        _process_ttl_timer.start()
+        logger.info(
+            "Process TTL active: exit after %s s wall clock (DC_SDK_TTL_SECONDS)",
+            ttl_sec,
+        )
+    else:
+        logger.info(
+            "Process TTL disabled (DC_SDK_TTL_SECONDS=%r)",
+            os.environ.get("DC_SDK_TTL_SECONDS"),
+        )
 
     api_key = os.getenv("OPENAI_API_KEY")
     ai_port = int(os.getenv("AI_PORT", 5050))
@@ -721,9 +798,13 @@ def start_ai_http():
 
     # ✅ Write code-server config
     with open("/root/.config/code-server/config.yaml", "w") as f:
-        f.write(f"""bind-addr: 0.0.0.0:{code_port}
-auth: none
-""")
+        f.write(
+            f"bind-addr: 0.0.0.0:{code_port}\n"
+            "auth: none\n"
+        )
+
+    with open("/root/.config/code-server/config.yaml", "r") as f:
+        logger.info("code-server config:\n%s", f.read())
 
     # ✅ Ensure workspace + vscode dir exists
     os.makedirs(workspace, exist_ok=True)
@@ -752,10 +833,17 @@ auth: none
         raise Exception("code-server failed to start")
 
     def shutdown():
+        global _process_ttl_timer
+        tm = _process_ttl_timer
+        _process_ttl_timer = None
+        if tm is not None:
+            tm.cancel()
         logger.info("Shutting down code-server...")
         if code_server_proc:
             code_server_proc.terminate()
 
+    ttl_shutdown_holder["fn"] = shutdown
+
     atexit.register(shutdown)
 
     def handle_signal(sig, frame):
@@ -777,9 +865,16 @@ auth: none
 
 @app.get("/session-info")
 def session_info():
-    return {
+    out: Dict[str, Any] = {
         "workspace": workspace,
         "ai_port": int(os.getenv("AI_PORT", 5050)),
         "code_server_port": int(os.getenv("CODE_SERVER_PORT", 5002)),
-        "api_base": f"http://localhost:{os.getenv('AI_PORT', 5050)}"
-    }
+        "api_base": f"http://localhost:{os.getenv('AI_PORT', 5050)}",
+    }
+    if process_ttl_seconds is not None and process_ttl_deadline_unix is not None:
+        out["ttl_seconds"] = process_ttl_seconds
+        out["ttl_deadline_unix"] = process_ttl_deadline_unix
+        out["ttl_remaining_seconds"] = max(
+            0.0, process_ttl_deadline_unix - time.time()
+        )
+    return out

{dc_python_sdk-1.5.20 → dc_python_sdk-1.5.22}/src/dc_sdk/src/server.py

@@ -88,10 +88,11 @@ def invoke(req: InvokeRequest):
     }
 
 
-def start_server():
+def start_server(port: Optional[int] = None):
     import uvicorn
+    listen = int(os.getenv("PORT", 5000)) if port is None else int(port)
     uvicorn.run(
         "dc_sdk.src.server:app",
         host="0.0.0.0",
-        port=int(os.getenv("PORT", 5000))
+        port=listen,
     )