Merge remote-tracking branch 'origin/main' into feat/queue-based-graph-engine

api/core/helper/code_executor/code_executor.py

@@ -2,7 +2,7 @@ import logging
 from collections.abc import Mapping
 from enum import StrEnum
 from threading import Lock
-from typing import Any, Optional
+from typing import Any
 
 from httpx import Timeout, post
 from pydantic import BaseModel
@@ -24,8 +24,8 @@ class CodeExecutionError(Exception):
 
 class CodeExecutionResponse(BaseModel):
     class Data(BaseModel):
-        stdout: Optional[str] = None
-        error: Optional[str] = None
+        stdout: str | None = None
+        error: str | None = None
 
     code: int
     message: str

api/core/helper/model_provider_cache.py

@@ -1,7 +1,6 @@
 import json
 from enum import StrEnum
 from json import JSONDecodeError
-from typing import Optional
 
 from extensions.ext_redis import redis_client
 
@@ -16,7 +15,7 @@ class ProviderCredentialsCache:
     def __init__(self, tenant_id: str, identity_id: str, cache_type: ProviderCredentialsCacheType):
         self.cache_key = f"{cache_type}_credentials:tenant_id:{tenant_id}:id:{identity_id}"
 
-    def get(self) -> Optional[dict]:
+    def get(self) -> dict | None:
         """
         Get cached model provider credentials.
 

api/core/helper/provider_cache.py

@@ -1,7 +1,7 @@
 import json
 from abc import ABC, abstractmethod
 from json import JSONDecodeError
-from typing import Any, Optional
+from typing import Any
 
 from extensions.ext_redis import redis_client
 
@@ -17,7 +17,7 @@ class ProviderCredentialsCache(ABC):
         """Generate cache key based on subclass implementation"""
         pass
 
-    def get(self) -> Optional[dict]:
+    def get(self) -> dict | None:
         """Get cached provider credentials"""
         cached_credentials = redis_client.get(self.cache_key)
         if cached_credentials:
@@ -71,7 +71,7 @@ class ToolProviderCredentialsCache(ProviderCredentialsCache):
 class NoOpProviderCredentialCache:
     """No-op provider credential cache"""
 
-    def get(self) -> Optional[dict]:
+    def get(self) -> dict | None:
         """Get cached provider credentials"""
         return None
 

api/core/helper/tool_parameter_cache.py

@@ -1,7 +1,6 @@
 import json
 from enum import StrEnum
 from json import JSONDecodeError
-from typing import Optional
 
 from extensions.ext_redis import redis_client
 
@@ -19,7 +18,7 @@ class ToolParameterCache:
             f":identity_id:{identity_id}"
         )
 
-    def get(self) -> Optional[dict]:
+    def get(self) -> dict | None:
         """
         Get cached model provider credentials.
 

api/core/helper/trace_id_helper.py

@@ -1,7 +1,7 @@
 import contextlib
 import re
 from collections.abc import Mapping
-from typing import Any, Optional
+from typing import Any
 
 
 def is_valid_trace_id(trace_id: str) -> bool:
@@ -13,7 +13,7 @@ def is_valid_trace_id(trace_id: str) -> bool:
     return bool(re.match(r"^[a-zA-Z0-9\-_]{1,128}$", trace_id))
 
 
-def get_external_trace_id(request: Any) -> Optional[str]:
+def get_external_trace_id(request: Any) -> str | None:
     """
     Retrieve the trace_id from the request.
 
@@ -61,7 +61,7 @@ def extract_external_trace_id_from_args(args: Mapping[str, Any]):
     return {}
 
 
-def get_trace_id_from_otel_context() -> Optional[str]:
+def get_trace_id_from_otel_context() -> str | None:
     """
     Retrieve the current trace ID from the active OpenTelemetry trace context.
     Returns None if:
@@ -88,7 +88,7 @@ def get_trace_id_from_otel_context() -> Optional[str]:
         return None
 
 
-def parse_traceparent_header(traceparent: str) -> Optional[str]:
+def parse_traceparent_header(traceparent: str) -> str | None:
     """
     Parse the `traceparent` header to extract the trace_id.