codemie-sdk-python 0.1.427__tar.gz → 0.1.429__tar.gz

{codemie_sdk_python-0.1.427 → codemie_sdk_python-0.1.429}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codemie-sdk-python
-Version: 0.1.427
+Version: 0.1.429
 Summary: CodeMie SDK for Python
 Author: Vadym Vlasenko
 Author-email: vadym_vlasenko@epam.com

{codemie_sdk_python-0.1.427 → codemie_sdk_python-0.1.429}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "codemie-sdk-python"
-version = "0.1.427"
+version = "0.1.429"
 description = "CodeMie SDK for Python"
 authors = [
     "Vadym Vlasenko <vadym_vlasenko@epam.com>",

{codemie_sdk_python-0.1.427 → codemie_sdk_python-0.1.429}/src/codemie_sdk/auth/credentials.py

@@ -1,22 +1,25 @@
 """Authentication credentials module for CodeMie SDK."""
 
+import time
 import requests
-from typing import Optional
+from typing import Callable
 
 
 class KeycloakCredentials:
     """Keycloak authentication credentials handler."""
 
+    _TOKEN_EXPIRY_BUFFER_SECONDS = 30
+
     def __init__(
         self,
         server_url: str,
         realm_name: str,
-        client_id: Optional[str] = None,
-        client_secret: Optional[str] = None,
-        username: Optional[str] = None,
-        password: Optional[str] = None,
-        external_token: Optional[str] = None,
-        external_idp: Optional[str] = None,
+        client_id: str | None = None,
+        client_secret: str | None = None,
+        username: str | None = None,
+        password: str | None = None,
+        external_token: str | Callable[[], str] | None = None,
+        external_idp: str | None = None,
         verify_ssl: bool = True,
     ):
         """Initialize Keycloak credentials.
@@ -41,9 +44,15 @@ class KeycloakCredentials:
         self.external_token = external_token
         self.external_idp = external_idp
         self.verify_ssl = verify_ssl
+        self._cached_token: str | None = None
+        self._token_expires_at: float = 0.0
 
     def get_token(self) -> str:
-        """Get access token using either client credentials or password grant."""
+        """Get access token, returning cached value if still valid."""
+        now = time.monotonic()
+        if self._cached_token and now < self._token_expires_at:
+            return self._cached_token
+
         if not (
             (self.client_id and self.client_secret)
             or (self.username and self.password)
@@ -57,28 +66,31 @@ class KeycloakCredentials:
             f"{self.server_url}/realms/{self.realm_name}/protocol/openid-connect/token"
         )
 
-        if self.username and self.password:
-            # Use Resource Owner Password Credentials flow
-            payload = {
-                "grant_type": "password",
-                "username": self.username,
-                "password": self.password,
-                "client_id": self.client_id
-                or "codemie-sdk",  # Use default client if not specified
-            }
-            if self.client_secret:
-                payload["client_secret"] = self.client_secret
-        elif self.external_token and self.external_idp:
+        if self.external_token and self.external_idp:
+            subject_token = (
+                self.external_token()
+                if callable(self.external_token)
+                else self.external_token
+            )
             payload = {
                 "client_id": self.client_id,
                 "client_secret": self.client_secret,
                 "grant_type": "urn:ietf:params:oauth:grant-type:token-exchange",
-                "subject_token": self.external_token,
+                "subject_token": subject_token,
+                "subject_token_type": "urn:ietf:params:oauth:token-type:access_token",
                 "subject_issuer": self.external_idp,
                 "requested_token_type": "urn:ietf:params:oauth:token-type:access_token",
             }
+        elif self.username and self.password:
+            payload = {
+                "grant_type": "password",
+                "username": self.username,
+                "password": self.password,
+                "client_id": self.client_id or "codemie-sdk",
+            }
+            if self.client_secret:
+                payload["client_secret"] = self.client_secret
         else:
-            # Use Client Credentials flow
             payload = {
                 "grant_type": "client_credentials",
                 "client_id": self.client_id,
@@ -87,7 +99,11 @@ class KeycloakCredentials:
 
         response = requests.post(url, data=payload, verify=self.verify_ssl)
         response.raise_for_status()
-        return response.json()["access_token"]
+        data = response.json()
+        self._cached_token = data["access_token"]
+        expires_in = data.get("expires_in", 300)
+        self._token_expires_at = now + expires_in - self._TOKEN_EXPIRY_BUFFER_SECONDS
+        return self._cached_token
 
     def exchange_token_for_user(self, email: str, access_token: str) -> str:
         """Exchange service account token for user token."""
@@ -118,7 +134,7 @@ class KeycloakCredentials:
         payload = {
             "client_id": self.client_id,
             "client_secret": self.client_secret,
-            "grant_type": "urn:ietf:params:oauth:grant-datasource_type:token-exchange",
+            "grant_type": "urn:ietf:params:oauth:grant-type:token-exchange",
             "subject_token": service_account_token,
             "requested_subject": user_id,
         }

{codemie_sdk_python-0.1.427 → codemie_sdk_python-0.1.429}/src/codemie_sdk/client/client.py

@@ -1,6 +1,6 @@
 """Base client implementation for CodeMie SDK."""
 
-from typing import Optional
+from typing import Callable
 
 from ..auth.credentials import KeycloakCredentials
 from ..services.admin import AdminService
@@ -34,12 +34,12 @@ class CodeMieClient:
         auth_server_url: str,
         auth_realm_name: str,
         codemie_api_domain: str,
-        auth_client_id: Optional[str] = None,
-        auth_client_secret: Optional[str] = None,
-        username: Optional[str] = None,
-        password: Optional[str] = None,
-        external_token: Optional[str] = None,
-        external_idp: Optional[str] = None,
+        auth_client_id: str | None = None,
+        auth_client_secret: str | None = None,
+        username: str | None = None,
+        password: str | None = None,
+        external_token: str | Callable[[], str] | None = None,
+        external_idp: str | None = None,
         verify_ssl: bool = True,
     ):
         """Initialize CodeMie client with authentication credentials.
@@ -68,7 +68,7 @@ class CodeMieClient:
             verify_ssl=verify_ssl,
         )
 
-        self._token: Optional[str] = None
+        self._token: str | None = None
         self._api_domain = codemie_api_domain.rstrip("/")
         self._is_localhost = self._is_localhost_domain(self._api_domain)
         self._verify_ssl = verify_ssl
@@ -78,62 +78,68 @@ class CodeMieClient:
 
             requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 
-        # Initialize token
+        # Initialize token; keep string copy for backward-compat callers reading _token directly
         self._token = "" if self._is_localhost else self.auth.get_token()
+        # Services receive the bound method so each request resolves a fresh (cached) token
+        _token_source = "" if self._is_localhost else self.auth.get_token
 
         # Initialize services with verify_ssl parameter and token
-        self.admin = AdminService(self._api_domain, self._token, verify_ssl=verify_ssl)
+        self.admin = AdminService(
+            self._api_domain, _token_source, verify_ssl=verify_ssl
+        )
         self.analytics = AnalyticsService(
-            self._api_domain, self._token, verify_ssl=verify_ssl
+            self._api_domain, _token_source, verify_ssl=verify_ssl
         )
         self.assistants = AssistantService(
-            self._api_domain, self._token, verify_ssl=verify_ssl
+            self._api_domain, _token_source, verify_ssl=verify_ssl
         )
         self.categories = CategoryService(
-            self._api_domain, self._token, verify_ssl=verify_ssl
+            self._api_domain, _token_source, verify_ssl=verify_ssl
         )
-        self.llms = LLMService(self._api_domain, self._token, verify_ssl=verify_ssl)
+        self.llms = LLMService(self._api_domain, _token_source, verify_ssl=verify_ssl)
         self.mermaid = MermaidService(
-            self._api_domain, self._token, verify_ssl=verify_ssl
+            self._api_domain, _token_source, verify_ssl=verify_ssl
         )
         self.integrations = IntegrationService(
-            self._api_domain, self._token, verify_ssl=verify_ssl
+            self._api_domain, _token_source, verify_ssl=verify_ssl
         )
         self.projects = ProjectService(
-            self._api_domain, self._token, verify_ssl=verify_ssl
+            self._api_domain, _token_source, verify_ssl=verify_ssl
+        )
+        self.skills = SkillService(
+            self._api_domain, _token_source, verify_ssl=verify_ssl
         )
-        self.skills = SkillService(self._api_domain, self._token, verify_ssl=verify_ssl)
-        self.tasks = TaskService(self._api_domain, self._token, verify_ssl=verify_ssl)
-        self.users = UserService(self._api_domain, self._token, verify_ssl=verify_ssl)
+        self.tasks = TaskService(self._api_domain, _token_source, verify_ssl=verify_ssl)
+        self.users = UserService(self._api_domain, _token_source, verify_ssl=verify_ssl)
         self.datasources = DatasourceService(
-            self._api_domain, self._token, verify_ssl=verify_ssl
+            self._api_domain, _token_source, verify_ssl=verify_ssl
         )
         self.workflows = WorkflowService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
+            self._api_domain, _token_source, verify_ssl=self._verify_ssl
         )
         self.conversations = ConversationService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
+            self._api_domain, _token_source, verify_ssl=self._verify_ssl
         )
         self.files = FileOperationService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
+            self._api_domain, _token_source, verify_ssl=self._verify_ssl
         )
         self.webhook = WebhookService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
+            self._api_domain, _token_source, verify_ssl=self._verify_ssl
         )
         self.vendor_assistants = VendorAssistantService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
+            self._api_domain, _token_source, verify_ssl=self._verify_ssl
         )
         self.vendor_workflows = VendorWorkflowService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
+            self._api_domain, _token_source, verify_ssl=self._verify_ssl
         )
         self.vendor_knowledgebases = VendorKnowledgeBaseService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
+            self._api_domain, _token_source, verify_ssl=self._verify_ssl
         )
         self.vendor_guardrails = VendorGuardrailService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
+            self._api_domain, _token_source, verify_ssl=self._verify_ssl
         )
         self.codemie_guardrails = CodemieGuardrailService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
+            self._api_domain, _token_source, verify_ssl=self._verify_ssl
         )
 
     @property
@@ -156,66 +162,9 @@ class CodeMieClient:
 
     def refresh_token(self) -> str:
         """Force token refresh."""
+        # Invalidate cache so next get_token() call re-fetches from Keycloak
+        self.auth._cached_token = None
+        self.auth._token_expires_at = 0.0
         self._token = "" if self._is_localhost else self.auth.get_token()
-        # Update token in services
-        self.admin = AdminService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.analytics = AnalyticsService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.assistants = AssistantService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.categories = CategoryService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.llms = LLMService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.mermaid = MermaidService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.integrations = IntegrationService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.skills = SkillService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.tasks = TaskService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.users = UserService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.datasources = DatasourceService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.workflows = WorkflowService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.conversations = ConversationService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.files = FileOperationService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.webhook = WebhookService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.vendor_assistants = VendorAssistantService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.vendor_workflows = VendorWorkflowService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.vendor_knowledgebases = VendorKnowledgeBaseService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.vendor_guardrails = VendorGuardrailService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
-        self.codemie_guardrails = CodemieGuardrailService(
-            self._api_domain, self._token, verify_ssl=self._verify_ssl
-        )
+        # Services already hold self.auth.get_token callable, so no reconstruction needed
         return self._token

{codemie_sdk_python-0.1.427 → codemie_sdk_python-0.1.429}/src/codemie_sdk/exceptions.py

@@ -1,7 +1,5 @@
 """Custom exceptions for the CodeMie SDK."""
 
-from typing import Optional
-
 
 class CodeMieError(Exception):
     """Base exception for all CodeMie SDK errors."""
@@ -15,8 +13,8 @@ class ApiError(CodeMieError):
     def __init__(
         self,
         message: str,
-        status_code: Optional[int] = None,
-        response: Optional[dict] = None,
+        status_code: int | None = None,
+        response: dict | None = None,
     ):
         """Initialize API error.
 

{codemie_sdk_python-0.1.427 → codemie_sdk_python-0.1.429}/src/codemie_sdk/models/admin.py

@@ -1,6 +1,5 @@
 """Admin models for managing applications/projects."""
 
-from typing import List
 from pydantic import BaseModel, ConfigDict, Field
 
 
@@ -9,7 +8,7 @@ class ApplicationsListResponse(BaseModel):
 
     model_config = ConfigDict(extra="ignore")
 
-    applications: List[str] = Field(..., description="List of application names")
+    applications: list[str] = Field(..., description="List of application names")
 
 
 class ApplicationCreateRequest(BaseModel):

{codemie_sdk_python-0.1.427 → codemie_sdk_python-0.1.429}/src/codemie_sdk/models/analytics.py

@@ -1,6 +1,6 @@
 """Models for analytics-related data structures."""
 
-from typing import Any, Dict, List, Optional
+from typing import Any
 
 from pydantic import BaseModel, ConfigDict, Field
 
@@ -12,7 +12,7 @@ class ResponseMetadata(BaseModel):
 
     timestamp: str = Field(description="ISO 8601 timestamp when response generated")
     data_as_of: str = Field(description="ISO 8601 timestamp of data freshness")
-    filters_applied: Dict[str, Any] = Field(description="Applied filters")
+    filters_applied: dict[str, Any] = Field(description="Applied filters")
     execution_time_ms: float = Field(description="Query execution time in milliseconds")
 
 
@@ -35,10 +35,10 @@ class ColumnDefinition(BaseModel):
     id: str = Field(description="Column identifier")
     label: str = Field(description="Human-readable label")
     type: str = Field(description='Data type: "string", "number", "date"')
-    format: Optional[str] = Field(
+    format: str | None = Field(
         None, description='Format hint: "currency", "percentage", "timestamp"'
     )
-    description: Optional[str] = Field(None, description="Column description")
+    description: str | None = Field(None, description="Column description")
 
 
 class Metric(BaseModel):
@@ -50,10 +50,10 @@ class Metric(BaseModel):
     label: str = Field(description="Human-readable label")
     type: str = Field(description="Data type")
     value: Any = Field(description="Metric value (int, float, str, etc.)")
-    format: Optional[str] = Field(
+    format: str | None = Field(
         None, description='Format hint: "currency", "percentage", "number"'
     )
-    description: Optional[str] = Field(None, description="Metric description")
+    description: str | None = Field(None, description="Metric description")
 
 
 class SummariesData(BaseModel):
@@ -61,7 +61,7 @@ class SummariesData(BaseModel):
 
     model_config = ConfigDict(extra="ignore")
 
-    metrics: List[Metric] = Field(description="Array of metrics")
+    metrics: list[Metric] = Field(description="Array of metrics")
 
 
 class TabularData(BaseModel):
@@ -69,9 +69,9 @@ class TabularData(BaseModel):
 
     model_config = ConfigDict(extra="ignore")
 
-    columns: List[ColumnDefinition] = Field(description="Column definitions")
-    rows: List[Dict[str, Any]] = Field(description="Data rows (dict per row)")
-    totals: Optional[Dict[str, Any]] = Field(None, description="Optional totals row")
+    columns: list[ColumnDefinition] = Field(description="Column definitions")
+    rows: list[dict[str, Any]] = Field(description="Data rows (dict per row)")
+    totals: dict[str, Any] | None = Field(None, description="Optional totals row")
 
 
 class UserListItem(BaseModel):
@@ -88,7 +88,7 @@ class UsersListData(BaseModel):
 
     model_config = ConfigDict(extra="ignore")
 
-    users: List[UserListItem] = Field(description="List of users")
+    users: list[UserListItem] = Field(description="List of users")
     total_count: int = Field(description="Total number of users")
 
 
@@ -108,7 +108,7 @@ class TabularResponse(BaseModel):
 
     data: TabularData = Field(description="Tabular data")
     metadata: ResponseMetadata = Field(description="Response metadata")
-    pagination: Optional[PaginationMetadata] = Field(
+    pagination: PaginationMetadata | None = Field(
         None, description="Optional pagination metadata"
     )
 
@@ -127,18 +127,18 @@ class AnalyticsQueryParams(BaseModel):
 
     model_config = ConfigDict(extra="ignore")
 
-    time_period: Optional[str] = Field(
+    time_period: str | None = Field(
         None,
         description='Time period: "last_hour", "last_6_hours", "last_24_hours", "last_7_days", "last_30_days", "last_90_days", "last_year"',
     )
-    start_date: Optional[str] = Field(
+    start_date: str | None = Field(
         None, description="ISO 8601 format start date (use with end_date)"
     )
-    end_date: Optional[str] = Field(
+    end_date: str | None = Field(
         None, description="ISO 8601 format end date (use with start_date)"
     )
-    users: Optional[str] = Field(None, description="Comma-separated user IDs")
-    projects: Optional[str] = Field(None, description="Comma-separated project names")
+    users: str | None = Field(None, description="Comma-separated user IDs")
+    projects: str | None = Field(None, description="Comma-separated project names")
 
 
 class PaginatedAnalyticsQueryParams(AnalyticsQueryParams):