onex-cli 1.10.2__tar.gz → 1.10.3__tar.gz

{onex_cli-1.10.2/onex_cli.egg-info → onex_cli-1.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onex-cli
-Version: 1.10.2
+Version: 1.10.3
 Summary: Official CLI for deploying and managing services on OneXEOS Platform (Windows, macOS, Linux)
 Home-page: https://github.com/onexeos/onex-cli
 Author: OneXEOS Platform Team

{onex_cli-1.10.2 → onex_cli-1.10.3}/onex/__init__.py

@@ -1,2 +1,2 @@
 # OneXEOS Services CLI
-__version__ = "1.10.2"
+__version__ = "1.10.3"

{onex_cli-1.10.2 → onex_cli-1.10.3}/onex/mcp/server.py

@@ -425,45 +425,88 @@ async def onex_trace(
     platform_url = _get_platform_url(env)
 
     try:
-        # Retry once on 503 (Loki transiently unavailable) or timeout
-        resp = None
-        for attempt in range(2):
-            try:
-                resp = await _authenticated_request(
-                    'get',
-                    f"{platform_url}/_internal/trace/{trace_id}",
-                    env,
-                    timeout=15
-                )
-                if resp.status_code != 503 or attempt == 1:
-                    break
-                import asyncio
-                await asyncio.sleep(2)
-            except httpx.TimeoutException:
-                if attempt == 1:
-                    return f"Request timed out connecting to {platform_url} after retries"
-                import asyncio
-                await asyncio.sleep(2)
-
-        if resp is None:
-            return f"Request timed out connecting to {platform_url}"
+        # Query Loki directly — bypasses gateway auth and its internal Loki timeout
+        from urllib.parse import urlparse
+        parsed = urlparse(platform_url)
+        loki_url = f"http://{parsed.hostname}:3100"
 
-        if resp.status_code == 200:
-            data = resp.json()
-            if json_output:
-                return json.dumps(data, indent=2)
+        from datetime import datetime, timedelta
+        now = datetime.now()
+        start_ns = int((now - timedelta(hours=24)).timestamp() * 1e9)
+        end_ns = int(now.timestamp() * 1e9)
+        query = f'{{trace_id="{trace_id}"}}'
 
-            timeline = data.get('timeline', [])
-            total_logs = data.get('total_logs', 0)
+        async with httpx.AsyncClient(timeout=10) as client:
+            resp = await client.get(
+                f"{loki_url}/loki/api/v1/query_range",
+                params={
+                    'query': query,
+                    'start': str(start_ns),
+                    'end': str(end_ns),
+                    'limit': 1000
+                }
+            )
 
-            if total_logs == 0:
-                return (
-                    f"No logs found for trace_id: {trace_id}\n"
-                    "This could mean:\n"
-                    "  - Request hasn't been processed yet\n"
-                    "  - Trace_id is incorrect\n"
-                    "  - Logs have expired (older than 24 hours)"
-                )
+        if resp.status_code != 200:
+            return f"Loki query failed: HTTP {resp.status_code}"
+
+        loki_data = resp.json()
+        if loki_data.get('status') != 'success':
+            return f"Loki query failed: {loki_data}"
+
+        # Parse Loki results into timeline format
+        results = loki_data.get('data', {}).get('result', [])
+        timeline = []
+        for result in results:
+            stream = result.get('stream', {})
+            for value in result.get('values', []):
+                timestamp_ns, log_line = value
+                try:
+                    log_data = json.loads(log_line)
+                except Exception:
+                    log_data = {'message': log_line}
+
+                component = stream.get('component') or stream.get('service') or log_data.get('service') or 'unknown'
+                log_event = stream.get('log_event') or stream.get('event', '')
+                method = stream.get('method', log_data.get('method', ''))
+                path = stream.get('path', log_data.get('path', ''))
+                message = log_data.get('message', log_line)
+                status_code = log_data.get('status_code')
+                duration_ms = log_data.get('duration_ms') or log_data.get('execution_time_ms')
+                error = log_data.get('error')
+                if not error and message and ' | ' in message:
+                    error = message.split(' | ', 1)[1]
+
+                timeline.append({
+                    'timestamp': int(timestamp_ns) // 1000000,
+                    'component': component,
+                    'level': stream.get('level', log_data.get('level', 'INFO')).upper(),
+                    'event': log_data.get('event', log_event),
+                    'message': message,
+                    'method': method,
+                    'path': path,
+                    'status_code': status_code,
+                    'duration_ms': duration_ms,
+                    'error': error,
+                    'data': log_data,
+                })
+
+        timeline.sort(key=lambda x: x['timestamp'])
+        total_logs = len(timeline)
+
+        data = {'trace_id': trace_id, 'total_logs': total_logs, 'timeline': timeline}
+
+        if json_output:
+            return json.dumps(data, indent=2)
+
+        if total_logs == 0:
+            return (
+                f"No logs found for trace_id: {trace_id}\n"
+                "This could mean:\n"
+                "  - Request hasn't been processed yet\n"
+                "  - Trace_id is incorrect\n"
+                "  - Logs have expired (older than 24 hours)"
+            )
 
             # Extract request metadata from first/last logs
             req_method = ''
@@ -590,15 +633,10 @@ async def onex_trace(
 
             return "\n".join(lines)
 
-        elif resp.status_code == 401:
-            return f"Authentication failed. Run: onex login --env {env}"
-        elif resp.status_code == 503:
-            return "Loki service unavailable. Make sure observability stack is running."
-        else:
-            return f"Failed to query trace: HTTP {resp.status_code}"
-
     except httpx.ConnectError:
-        return f"Cannot connect to platform at {platform_url}. Make sure platform is running."
+        return f"Cannot connect to Loki at {loki_url}. Make sure observability stack is running."
+    except httpx.TimeoutException:
+        return f"Loki query timed out at {loki_url}. Loki may be overloaded."
     except Exception as e:
         return f"Error querying trace: {e}"
 

{onex_cli-1.10.2 → onex_cli-1.10.3/onex_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onex-cli
-Version: 1.10.2
+Version: 1.10.3
 Summary: Official CLI for deploying and managing services on OneXEOS Platform (Windows, macOS, Linux)
 Home-page: https://github.com/onexeos/onex-cli
 Author: OneXEOS Platform Team