dc-python-sdk 1.5.25__tar.gz → 1.5.27__tar.gz

{dc_python_sdk-1.5.25/src/dc_python_sdk.egg-info → dc_python_sdk-1.5.27}/PKG-INFO

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

{dc_python_sdk-1.5.25 → dc_python_sdk-1.5.27}/pyproject.toml

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

{dc_python_sdk-1.5.25 → dc_python_sdk-1.5.27}/setup.cfg

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

{dc_python_sdk-1.5.25 → dc_python_sdk-1.5.27/src/dc_python_sdk.egg-info}/PKG-INFO

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

dc_python_sdk-1.5.25/src/dc_sdk/src/ai_http.py → dc_python_sdk-1.5.27/src/dc_sdk/src/ai.py

@@ -74,92 +74,6 @@ class RunRequest(BaseModel):
     # When objects_dynamic is true and get_objects returns []: required — used to probe get_fields/get_data.
     test_object_ids: Optional[List[str]] = None
 
-
-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 _wait_connector_healthy() -> None:
-    for _ in range(50):
-        try:
-            res = requests.get(f"http://localhost:{CONNECTOR_PORT}/health", timeout=2)
-            if res.status_code == 200:
-                logger.info("Connector ready on port %s", CONNECTOR_PORT)
-                return
-        except Exception:
-            logger.debug("Health check not ready yet on port %s", CONNECTOR_PORT)
-        time.sleep(0.1)
-    raise RuntimeError(
-        f"Connector failed to become healthy on port {CONNECTOR_PORT} within timeout"
-    )
-
-
-def _start_connector_subprocess_unlocked() -> None:
-    global _connector_proc, workspace
-    env = os.environ.copy()
-    env["CONNECTOR_HTTP_RELOAD"] = "1"
-    proc = subprocess.Popen(
-        ["dc-sdk", "http"],
-        cwd=workspace,
-        env=env,
-        stdout=subprocess.DEVNULL,
-        stderr=subprocess.DEVNULL,
-    )
-    try:
-        _wait_connector_healthy()
-    except Exception:
-        proc.terminate()
-        try:
-            proc.wait(timeout=5)
-        except Exception:
-            pass
-        raise
-    _connector_proc = proc
-
-
-def _stop_connector_subprocess_unlocked() -> None:
-    global _connector_proc
-    proc = _connector_proc
-    _connector_proc = None
-    if proc is None:
-        return
-    try:
-        proc.terminate()
-        proc.wait(timeout=15)
-        logger.debug("Connector subprocess stopped")
-    except Exception:
-        logger.debug("Error stopping connector subprocess", exc_info=True)
-
-
-def start_connector_http_server() -> None:
-    """Start the connector HTTP child once; restart if the previous child exited."""
-    with _connector_lock:
-        if _connector_proc is not None and _connector_proc.poll() is None:
-            return
-        _stop_connector_subprocess_unlocked()
-        _start_connector_subprocess_unlocked()
-
-
 def invoke(method, session_id=None, credentials=None, params=None):
     payload = {
         "method": method,
@@ -245,7 +159,6 @@ def run_test(
     test_object_ids: Optional[List[str]] = None,
 ):
     requested_ids = [_canon_object_id(x) for x in (test_object_ids or []) if _canon_object_id(x)]
-    print(requested_ids)
 
     session_id = None
 
@@ -721,121 +634,11 @@ def feedback(req: FeedbackRequest):
         "ai_messages": ai_messages,
     }
 
-def clone_repo():
-    global workspace
-    repo = os.getenv("GH_REPO_URL")
-    token = os.getenv("GH_TOKEN")
-    branch = os.getenv("GH_BRANCH", "development")
-
-    if not repo:
-        return
-
-    if not os.path.exists(f"{workspace}/.git"):
-        clone_url = repo.replace("https://", f"https://{token}@")
-        subprocess.run(["git", "clone", clone_url, workspace], check=True)
-    else:
-        subprocess.run(["git", "-C", workspace, "fetch"], check=True)
-
-    subprocess.run(["git", "-C", workspace, "checkout", branch], check=True)
-    subprocess.run(["git", "-C", workspace, "pull"], check=True)
-
-def run_code_server():
-    logger.info("code-server path: %s", shutil.which("code-server"))
-
-    # ✅ Ensure config dir exists
-    os.makedirs("/root/.config/code-server", exist_ok=True)
-
-    # ✅ 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_SERVER_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)
-    os.makedirs(f"{workspace}/.vscode", exist_ok=True)
-
-    # ✅ Write VS Code settings
-    with open(f"{workspace}/.vscode/settings.json", "w") as f:
-        f.write("""{
-  "chat.disableAIFeatures": true,
-  "workbench.colorTheme": "Default Dark+",
-  "outline.showFiles": false,
-  "timeline.enabled": false,
-  "python.defaultInterpreterPath": "/usr/local/bin/python"
-}""")
-
-    # ✅ Start code-server (NO extension install here)
-    code_server_proc = subprocess.Popen([
-        "code-server",
-        workspace,
-        "--config", "/root/.config/code-server/config.yaml"
-    ])
-
-    time.sleep(3)
-
-    if code_server_proc.poll() is not None:
-        raise Exception("code-server failed to start")
-
-    return code_server_proc
-
-def start_ai_http(start_code_server=True):
+def start_ai_http():
     global client
-    global workspace
-    global process_ttl_seconds
-    global process_ttl_deadline_unix
-    global _process_ttl_timer
-
-    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")
 
-    clone_repo()
-    start_connector_http_server()
-
-    code_server_proc = None
-    if start_code_server:
-        code_server_proc = run_code_server()
-
     def shutdown():
         global _process_ttl_timer
         tm = _process_ttl_timer
@@ -843,8 +646,6 @@ def start_ai_http(start_code_server=True):
         if tm is not None:
             tm.cancel()
         logger.info("Shutting down code-server...")
-        if code_server_proc is not None:
-            code_server_proc.terminate()
         logger.info("Shutting down connector HTTP...")
         with _connector_lock:
             _stop_connector_subprocess_unlocked()
@@ -868,21 +669,4 @@ def start_ai_http(start_code_server=True):
     logger.info("Starting AI HTTP controller on 0.0.0.0:%s", AI_PORT)
 
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=AI_PORT)
-
-@app.get("/session-info")
-def session_info():
-    out: Dict[str, Any] = {
-        "workspace": workspace,
-        "connector_port": CONNECTOR_PORT,
-        "ai_port": AI_PORT,
-        "code_server_port": CODE_SERVER_PORT,
-        "api_base": f"http://localhost:{AI_PORT}",
-    }
-    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
+    uvicorn.run(app, host="0.0.0.0", port=AI_PORT)