qalita 2.6.2__py3-none-any.whl → 2.8.0__py3-none-any.whl

qalita/web/blueprints/dashboard.py

@@ -4,12 +4,10 @@
 
 from flask import Blueprint, current_app, request, jsonify
 
-from qalita.internal.request import send_request
 from qalita.internal.utils import logger
 from .helpers import (
-    compute_agent_summary,
-    read_selected_env,
-    parse_env_file,
+    compute_worker_summary,
+    get_platform_url,
 )
 
 
@@ -33,46 +31,16 @@ def dashboard_api():
 def _get_dashboard_data_json():
     """Get dashboard data as JSON"""
     cfg = current_app.config["QALITA_CONFIG_OBJ"]
-    agent_conf, agent_runs = compute_agent_summary(cfg)
-    # Load local sources regardless of agent configuration
+    worker_conf, worker_runs = compute_worker_summary(cfg)
+    # Load local sources regardless of worker configuration
     try:
         cfg.load_source_config()
         sources = list(reversed(cfg.config.get("sources", [])))
     except Exception:
         sources = []
 
-    # Resolve public platform URL
-    platform_url = None
-    try:
-        backend_url = getattr(cfg, "url", None)
-        try:
-            env_path = read_selected_env()
-            if env_path:
-                data = parse_env_file(env_path)
-                backend_url = (
-                    data.get("QALITA_AGENT_ENDPOINT")
-                    or data.get("QALITA_URL")
-                    or data.get("URL")
-                    or backend_url
-                )
-        except Exception:
-            pass
-        if backend_url:
-            try:
-                r = send_request.__wrapped__(
-                    cfg, request=f"{backend_url}/api/v1/info", mode="get"
-                )  # type: ignore[attr-defined]
-            except Exception:
-                r = None
-            if r is not None and getattr(r, "status_code", None) == 200:
-                try:
-                    platform_url = (r.json() or {}).get("public_platform_url")
-                except Exception:
-                    platform_url = None
-    except Exception:
-        platform_url = None
-    if isinstance(platform_url, str):
-        platform_url = platform_url.rstrip("/")
+    # Resolve public platform URL using centralized helper
+    platform_url = get_platform_url()
 
     # Pagination for runs
     try:
@@ -87,20 +55,20 @@ def _get_dashboard_data_json():
         page = 1
     if per_page <= 0:
         per_page = 10
-    total_runs = len(agent_runs)
+    total_runs = len(worker_runs)
     start_idx = (page - 1) * per_page
     end_idx = start_idx + per_page
-    agent_runs_page = agent_runs[start_idx:end_idx]
+    worker_runs_page = worker_runs[start_idx:end_idx]
     runs_has_prev = start_idx > 0
     runs_has_next = end_idx < total_runs
     runs_start = (start_idx + 1) if total_runs > 0 and start_idx < total_runs else 0
     runs_end = min(end_idx, total_runs) if total_runs > 0 else 0
 
     return jsonify({
-        "agent_conf": agent_conf or {},
+        "worker_conf": worker_conf or {},
         "sources": sources,
-        "agent_runs": agent_runs,
-        "agent_runs_page": agent_runs_page,
+        "worker_runs": worker_runs,
+        "worker_runs_page": worker_runs_page,
         "runs_total": total_runs,
         "runs_page": page,
         "runs_per_page": per_page,
@@ -122,7 +90,7 @@ def validate_sources():
     from qalita.commands.source import validate_source as _validate
 
     cfg = current_app.config["QALITA_CONFIG_OBJ"]
-    # Run validation (graceful if agent not configured)
+    # Run validation (graceful if worker not configured)
     try:
         try:
             _validate.__wrapped__(cfg)  # type: ignore[attr-defined]

qalita/web/blueprints/helpers.py

@@ -164,8 +164,8 @@ def ensure_default_env_selected(pointer_path: str):
             except Exception:
                 name = None
         if not name:
-            name = "agent"
-        safe = re.sub(r"[^A-Za-z0-9._-]+", "-", str(name)).strip("-_.") or "agent"
+            name = "worker"
+        safe = re.sub(r"[^A-Za-z0-9._-]+", "-", str(name)).strip("-_.") or "worker"
         target = os.path.normpath(os.path.join(base, f".env-{safe}"))
         os.makedirs(base, exist_ok=True)
         materialize_env_from_process_env(target)
@@ -264,12 +264,12 @@ def list_env_files():
     return files
 
 
-def agent_pid_file_path():
-    return os.path.join(qalita_home(), "agent_run.pid")
+def worker_pid_file_path():
+    return os.path.join(qalita_home(), "worker_run.pid")
 
 
-def read_agent_pid():
-    p = agent_pid_file_path()
+def read_worker_pid():
+    p = worker_pid_file_path()
     try:
         if os.path.isfile(p):
             with open(p, "r", encoding="utf-8") as f:
@@ -280,8 +280,8 @@ def read_agent_pid():
     return None
 
 
-def agent_log_file_path():
-    return os.path.join(qalita_home(), "agent_run.log")
+def worker_log_file_path():
+    return os.path.join(qalita_home(), "worker_run.log")
 
 
 def is_pid_running(pid: int) -> bool:
@@ -306,8 +306,8 @@ def is_pid_running(pid: int) -> bool:
         return False
 
 
-def agent_status_payload() -> dict:
-    pid = read_agent_pid()
+def worker_status_payload() -> dict:
+    pid = read_worker_pid()
     running = bool(pid) and is_pid_running(int(pid))
     return {"running": running, "pid": int(pid) if running else None}
 
@@ -348,10 +348,10 @@ def open_path_in_file_explorer(target_path: str) -> tuple[bool, str]:
     return False, "none"
 
 
-def compute_agent_summary(cfg):
-    agent_conf = None
+def compute_worker_summary(cfg):
+    worker_conf = None
     try:
-        raw = cfg.load_agent_config()
+        raw = cfg.load_worker_config()
         if isinstance(raw, dict) and raw:
 
             def pick(obj, *path):
@@ -362,66 +362,66 @@ def compute_agent_summary(cfg):
                     cur = cur[key]
                 return cur
 
-            agent_conf = {
+            worker_conf = {
                 "name": pick(raw, "context", "remote", "name") or raw.get("name", ""),
                 "mode": pick(raw, "context", "local", "mode") or raw.get("mode", ""),
                 "url": pick(raw, "context", "local", "url") or raw.get("url", ""),
-                "agent_id": pick(raw, "context", "remote", "id")
-                or raw.get("agent_id", ""),
+                "worker_id": pick(raw, "context", "remote", "id")
+                or raw.get("worker_id", ""),
             }
         else:
-            agent_conf = None
+            worker_conf = None
     except SystemExit:
-        # Gracefully handle missing/invalid .agent in web requests
-        agent_conf = None
+        # Gracefully handle missing/invalid .worker in web requests
+        worker_conf = None
     except Exception:
-        agent_conf = None
+        worker_conf = None
     # Overlay with selected context values
     try:
         env_path = read_selected_env()
         if env_path:
             data = parse_env_file(env_path)
-            if agent_conf is None:
-                agent_conf = {}
-            agent_conf["name"] = (
+            if worker_conf is None:
+                worker_conf = {}
+            worker_conf["name"] = (
                 data.get("QALITA_WORKER_NAME")
                 or data.get("QALITA_AGENT_NAME")
                 or data.get("AGENT_NAME")
                 or data.get("NAME")
-                or agent_conf.get("name", "")
+                or worker_conf.get("name", "")
             )
-            agent_conf["mode"] = (
+            worker_conf["mode"] = (
                 data.get("QALITA_WORKER_MODE")
                 or data.get("QALITA_AGENT_MODE")
                 or data.get("AGENT_MODE")
                 or data.get("MODE")
-                or agent_conf.get("mode", "")
+                or worker_conf.get("mode", "")
             )
-            agent_conf["url"] = (
+            worker_conf["url"] = (
                 data.get("QALITA_WORKER_ENDPOINT")
                 or data.get("QALITA_AGENT_ENDPOINT")
                 or data.get("QALITA_URL")
                 or data.get("URL")
-                or agent_conf.get("url", "")
+                or worker_conf.get("url", "")
             )
     except Exception:
         pass
     # Final overlay from live cfg values
     try:
-        if agent_conf is None:
-            agent_conf = {}
-        if not agent_conf.get("name"):
-            agent_conf["name"] = getattr(cfg, "name", "") or agent_conf.get("name", "")
-        if not agent_conf.get("mode"):
-            agent_conf["mode"] = getattr(cfg, "mode", "") or agent_conf.get("mode", "")
-        if not agent_conf.get("url"):
-            agent_conf["url"] = getattr(cfg, "url", "") or agent_conf.get("url", "")
+        if worker_conf is None:
+            worker_conf = {}
+        if not worker_conf.get("name"):
+            worker_conf["name"] = getattr(cfg, "name", "") or worker_conf.get("name", "")
+        if not worker_conf.get("mode"):
+            worker_conf["mode"] = getattr(cfg, "mode", "") or worker_conf.get("mode", "")
+        if not worker_conf.get("url"):
+            worker_conf["url"] = getattr(cfg, "url", "") or worker_conf.get("url", "")
     except Exception:
         pass
-    # Build agent runs
-    agent_runs = []
+    # Build worker runs
+    worker_runs = []
     try:
-        run_root = cfg.get_agent_run_path()
+        run_root = cfg.get_worker_run_path()
         if os.path.isdir(run_root):
             pattern = re.compile(r"^\d{14}_[a-z0-9]{5}$")
             for entry in sorted(os.listdir(run_root), reverse=True):
@@ -435,7 +435,7 @@ def compute_agent_summary(cfg):
                         )
                     except Exception:
                         when = ts
-                    agent_runs.append(
+                    worker_runs.append(
                         {
                             "name": entry,
                             "path": os.path.join(run_root, entry),
@@ -444,12 +444,85 @@ def compute_agent_summary(cfg):
                         }
                     )
     except Exception:
-        agent_runs = []
-    return agent_conf, agent_runs
+        worker_runs = []
+    return worker_conf, worker_runs
+
+
+def get_backend_url() -> str | None:
+    """Get the current backend URL from the selected context.
+    
+    Reads from the selected .env file, falling back to the config object.
+    This ensures consistency with compute_worker_summary().
+    
+    Returns:
+        The backend URL or None if not configured.
+    """
+    backend_url = None
+    try:
+        cfg = current_app.config.get("QALITA_CONFIG_OBJ")
+        backend_url = getattr(cfg, "url", None)
+    except Exception:
+        pass
+    
+    # Override from selected .env context
+    try:
+        env_path = read_selected_env()
+        if env_path:
+            data = parse_env_file(env_path)
+            backend_url = (
+                data.get("QALITA_WORKER_ENDPOINT")
+                or data.get("QALITA_AGENT_ENDPOINT")
+                or data.get("QALITA_URL")
+                or data.get("URL")
+                or backend_url
+            )
+    except Exception:
+        pass
+    
+    return backend_url
+
+
+def get_platform_url() -> str | None:
+    """Get the public platform URL for the current context.
+    
+    This is the single source of truth for resolving platform_url.
+    It fetches from the backend's /api/v1/info endpoint using the
+    current context's backend URL.
+    
+    Returns:
+        The public platform URL (without trailing slash) or None.
+    """
+    from qalita.internal.request import send_request
+    
+    platform_url = None
+    try:
+        backend_url = get_backend_url()
+        if backend_url:
+            cfg = current_app.config.get("QALITA_CONFIG_OBJ")
+            try:
+                r = send_request.__wrapped__(
+                    cfg, request=f"{backend_url}/api/v1/info", mode="get"
+                )  # type: ignore[attr-defined]
+            except Exception:
+                r = None
+            if r is not None and getattr(r, "status_code", None) == 200:
+                try:
+                    platform_url = (r.json() or {}).get("public_platform_url")
+                except Exception:
+                    platform_url = None
+    except Exception:
+        platform_url = None
+    
+    # Normalize to avoid double slashes when building links
+    if isinstance(platform_url, str):
+        platform_url = platform_url.rstrip("/")
+    
+    return platform_url
 
 
 # Aliases for backward compatibility (agent -> worker refactoring)
-worker_pid_file_path = agent_pid_file_path
-worker_log_file_path = agent_log_file_path
-worker_status_payload = agent_status_payload
-compute_worker_summary = compute_agent_summary
+agent_pid_file_path = worker_pid_file_path
+agent_log_file_path = worker_log_file_path
+agent_status_payload = worker_status_payload
+compute_agent_summary = compute_worker_summary
+read_agent_pid = read_worker_pid

qalita/web/blueprints/sources.py

@@ -16,12 +16,12 @@ from flask import (
     request,
     jsonify,
 )
-from qalita.internal.request import send_request
 from qalita.commands.source import (
     validate_source_object,
     validate_source as _validate_all,
     push_single_programmatic,
 )
+from .helpers import get_platform_url
 
 
 bp = Blueprint("sources", __name__)
@@ -33,57 +33,8 @@ def list_sources():
     cfg.load_source_config()
     sources = cfg.config.get("sources", [])
 
-    # Resolve public platform URL from backend /api/v1/info using the agent backend URL
-    platform_url = None
-    try:
-        backend_url = getattr(cfg, "url", None)
-        # Try override from selected .env context without loading agent config (avoid SystemExit)
-        try:
-            env_path_file = os.path.join(
-                getattr(cfg, "qalita_home", os.path.expanduser("~/.qalita")),
-                ".current_env",
-            )
-            if os.path.isfile(env_path_file):
-                with open(env_path_file, "r", encoding="utf-8") as f:
-                    sel = f.read().strip()
-                    if sel and os.path.isfile(sel):
-                        with open(sel, "r", encoding="utf-8") as ef:
-                            for line in ef.readlines():
-                                line = line.strip()
-                                if not line or line.startswith("#") or "=" not in line:
-                                    continue
-                                k, v = line.split("=", 1)
-                                k = k.strip().upper()
-                                v = v.strip().strip('"').strip("'")
-                                if k in (
-                                    "QALITA_AGENT_ENDPOINT",
-                                    "AGENT_ENDPOINT",
-                                    "QALITA_URL",
-                                    "URL",
-                                ):
-                                    backend_url = v
-                                    break
-        except Exception:
-            pass
-
-        if backend_url:
-            try:
-                r = send_request.__wrapped__(
-                    cfg, request=f"{backend_url}/api/v1/info", mode="get"
-                )  # type: ignore[attr-defined]
-            except Exception:
-                r = None
-            if r is not None and getattr(r, "status_code", None) == 200:
-                try:
-                    platform_url = (r.json() or {}).get("public_platform_url")
-                except Exception:
-                    platform_url = None
-    except Exception:
-        platform_url = None
-
-    # Normalize platform_url to avoid double slashes when building links
-    if isinstance(platform_url, str):
-        platform_url = platform_url.rstrip("/")
+    # Resolve public platform URL using centralized helper
+    platform_url = get_platform_url()
 
     return jsonify({
         "sources": sources,
@@ -237,53 +188,8 @@ def add_source_post():
         # Skip push when not logged in / no .agent
         pass
 
-    # Resolve platform_url as in list_sources
-    platform_url = None
-    try:
-        backend_url = getattr(cfg, "url", None)
-        try:
-            env_path_file = os.path.join(
-                getattr(cfg, "qalita_home", os.path.expanduser("~/.qalita")),
-                ".current_env",
-            )
-            if os.path.isfile(env_path_file):
-                with open(env_path_file, "r", encoding="utf-8") as f:
-                    sel = f.read().strip()
-                    if sel and os.path.isfile(sel):
-                        with open(sel, "r", encoding="utf-8") as ef:
-                            for line in ef.readlines():
-                                line = line.strip()
-                                if not line or line.startswith("#") or "=" not in line:
-                                    continue
-                                k, v = line.split("=", 1)
-                                k = k.strip().upper()
-                                v = v.strip().strip('"').strip("'")
-                                if k in (
-                                    "QALITA_AGENT_ENDPOINT",
-                                    "AGENT_ENDPOINT",
-                                    "QALITA_URL",
-                                    "URL",
-                                ):
-                                    backend_url = v
-                                    break
-        except Exception:
-            pass
-        if backend_url:
-            try:
-                r = send_request.__wrapped__(
-                    cfg, request=f"{backend_url}/api/v1/info", mode="get"
-                )  # type: ignore[attr-defined]
-            except Exception:
-                r = None
-            if r is not None and getattr(r, "status_code", None) == 200:
-                try:
-                    platform_url = (r.json() or {}).get("public_platform_url")
-                except Exception:
-                    platform_url = None
-    except Exception:
-        platform_url = None
-    if isinstance(platform_url, str):
-        platform_url = platform_url.rstrip("/")
+    # Resolve platform_url using centralized helper
+    platform_url = get_platform_url()
 
     # Try to get the created source id (if present after validate/push)
     src_id = None

qalita/web/blueprints/workers.py

@@ -78,7 +78,7 @@ def worker_start():
         except Exception:
             worker_name = None
     if not worker_name:
-        worker_name = "agent"
+        worker_name = "worker"
 
     # Ensure we have minimum credentials before preflight
     if not getattr(cfg, "token", None) or not getattr(cfg, "url", None):
@@ -166,7 +166,7 @@ def worker_start():
         except Exception:
             env["QALITA_WORKER_MODE"] = "worker"
         logger.info(
-            f"worker_start: effective agent mode is [{env.get('QALITA_WORKER_MODE') or env.get('AGENT_MODE') or env.get('MODE')}]"
+            f"worker_start: effective worker mode is [{env.get('QALITA_WORKER_MODE') or env.get('AGENT_MODE') or env.get('MODE')}]"
         )
         if os.name == "nt":
             python_bin = sys.executable or "python"
@@ -248,7 +248,7 @@ def worker_start():
             except Exception:
                 env["QALITA_WORKER_MODE"] = "worker"
             logger.info(
-                f"worker_start(fallback): effective agent mode is [{env.get('QALITA_WORKER_MODE') or env.get('AGENT_MODE') or env.get('MODE')}]"
+                f"worker_start(fallback): effective worker mode is [{env.get('QALITA_WORKER_MODE') or env.get('AGENT_MODE') or env.get('MODE')}]"
             )
             python_bin = sys.executable or "python3"
             cmd = [
@@ -368,7 +368,7 @@ def open_worker_run(run_name: str):
         return jsonify({
             "ok": False,
             "error": "Invalid path",
-            "message": "If the path is invalid it means: Your local agent is not the one that ran the analysis you are trying to get files from, or the job failed or was cancelled.",
+            "message": "If the path is invalid it means: Your local worker is not the one that ran the analysis you are trying to get files from, or the job failed or was cancelled.",
         }), 400
 
     if not os.path.isdir(candidate):
@@ -376,7 +376,7 @@ def open_worker_run(run_name: str):
             "ok": False,
             "error": "Run folder not found",
             "path": candidate,
-            "message": "If the run folder does not exist it means: Your local agent is not the one that ran the analysis you are trying to get files from, or the job failed or was cancelled.",
+            "message": "If the run folder does not exist it means: Your local worker is not the one that ran the analysis you are trying to get files from, or the job failed or was cancelled.",
         }), 404
 
     ok, method_used = open_path_in_file_explorer(candidate)
@@ -424,7 +424,7 @@ def _login_with_env(env_path: str) -> None:
     name = (
         pick("QALITA_WORKER_NAME", "AGENT_NAME", "NAME")
         or getattr(cfg, "name", None)
-        or "agent"
+        or "worker"
     )
     mode = (
         pick("QALITA_WORKER_MODE", "AGENT_MODE", "MODE")

{qalita-2.6.2.dist-info → qalita-2.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qalita
-Version: 2.6.2
+Version: 2.8.0
 Summary: QALITA Platform Command Line Interface
 Author-email: QALITA SAS <contact@qalita.io>
 License-File: LICENSE
@@ -27,12 +27,16 @@ Requires-Dist: flask>=3.0.3
 Requires-Dist: gevent-websocket>=0.10.1
 Requires-Dist: gevent>=24.2.0
 Requires-Dist: google-cloud-storage>=2.16.0
+Requires-Dist: grpcio-tools>=1.60.0
+Requires-Dist: grpcio>=1.60.0
 Requires-Dist: hdfs>=2.7.3
 Requires-Dist: loguru>=0.7.0
 Requires-Dist: openpyxl>=3.1.5
 Requires-Dist: oracledb>=2.5.0
+Requires-Dist: pandas>=2.0.0
 Requires-Dist: paramiko>=3.4.0
 Requires-Dist: psycopg2-binary>=2.9.9
+Requires-Dist: pyarrow>=14.0.0
 Requires-Dist: pymongo>=4.6.3
 Requires-Dist: pymysql>=1.1.0
 Requires-Dist: python-socketio>=5.10.0
@@ -46,8 +50,10 @@ Requires-Dist: waitress==3.0.2
 Provides-Extra: dev
 Requires-Dist: black>=25.1.0; extra == 'dev'
 Requires-Dist: flake8<8.0,>=3.8.1; extra == 'dev'
+Requires-Dist: joserfc>=1.0.2; extra == 'dev'
 Requires-Dist: pre-commit>=3.3.3; extra == 'dev'
 Requires-Dist: pylint>=2.17.4; extra == 'dev'
+Requires-Dist: pytest-asyncio>=0.23.0; extra == 'dev'
 Requires-Dist: pytest>=7.4.0; extra == 'dev'
 Provides-Extra: studio
 Requires-Dist: qalita-studio>=0.1.0; extra == 'studio'