iatoolkit 2.44.2__tar.gz → 2.44.4__tar.gz

{iatoolkit-2.44.2/src/iatoolkit.egg-info → iatoolkit-2.44.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iatoolkit
-Version: 2.44.2
+Version: 2.44.4
 Summary: IAToolkit
 Author: Fernando Libedinsky
 License-Expression: MIT

{iatoolkit-2.44.2 → iatoolkit-2.44.4}/src/iatoolkit/__init__.py

@@ -3,7 +3,7 @@
 #
 # IAToolkit is open source software.
 
-__version__ = "2.44.2"
+__version__ = "2.44.4"
 
 # Expose main classes and functions at the top level of the package
 

{iatoolkit-2.44.2 → iatoolkit-2.44.4}/src/iatoolkit/infra/llm_providers/openai_compatible_chat_adapter.py

@@ -8,8 +8,11 @@ import json
 import logging
 import mimetypes
 import threading
+import time
 from typing import Any, Dict, List, Optional
 
+import openai
+
 from iatoolkit.common.exceptions import IAToolkitException
 from iatoolkit.infra.llm_response import LLMResponse, ToolCall, Usage
 
@@ -45,6 +48,16 @@ class OpenAICompatibleChatAdapter:
     supports_thinking = False
     allow_follow_up_tool_calls = True
 
+    #: `LLMProxy` builds every client with `max_retries=0` by default (see
+    #: `LLMProxy.DEFAULT_MAX_RETRIES`), so a bare transport failure - DNS,
+    #: TCP reset, TLS handshake - was previously only recovered by the RQ-level
+    #: task retry: 10s+ of wait, a full job re-run, and the earlier attempt's
+    #: error dropped (see `TaskService._record_task_retry_attempt`). Retrying a
+    #: handful of times here, right where the failure happens, recovers the
+    #: common "connection error, works on the 2nd try" case in ~1-2s instead.
+    _CONNECTION_ERROR_MAX_ATTEMPTS = 3
+    _CONNECTION_ERROR_RETRY_DELAY_SECONDS = 0.75
+
     def __init__(self, openai_compatible_client, provider_label: str = "OpenAI-compatible"):
         self.client = openai_compatible_client
         self.provider_label = provider_label
@@ -168,19 +181,44 @@ class OpenAICompatibleChatAdapter:
         _ = kwargs
 
     def _create_chat_completion(self, call_kwargs: Dict[str, Any]) -> Any:
-        try:
-            return self.client.chat.completions.create(**call_kwargs)
-        except Exception as ex:
-            retry_call_kwargs = self._build_retry_without_tool_choice_kwargs(call_kwargs, ex)
-            if retry_call_kwargs is None:
+        attempt = 1
+        while True:
+            try:
+                return self.client.chat.completions.create(**call_kwargs)
+            except openai.APITimeoutError:
+                # A read/write timeout means the request may already be running
+                # upstream (a long generation just took its time) - resending it
+                # would risk paying for the same generation twice with no
+                # guarantee the retry is any faster. Let the RQ-level task retry
+                # handle this one instead of looping on it here.
                 raise
+            except openai.APIConnectionError as ex:
+                # A transport-level failure (DNS, TCP reset, TLS handshake) happens
+                # before the request reaches the provider, so retrying is safe and
+                # cheap - unlike APITimeoutError above, there's no ambiguity about
+                # whether the provider already started working on this request.
+                if attempt >= self._CONNECTION_ERROR_MAX_ATTEMPTS:
+                    raise
+                logging.warning(
+                    "[%sAdapter] Connection error calling provider (attempt %s/%s); retrying: %s",
+                    self.provider_label,
+                    attempt,
+                    self._CONNECTION_ERROR_MAX_ATTEMPTS,
+                    ex,
+                )
+                time.sleep(self._CONNECTION_ERROR_RETRY_DELAY_SECONDS)
+                attempt += 1
+            except Exception as ex:
+                retry_call_kwargs = self._build_retry_without_tool_choice_kwargs(call_kwargs, ex)
+                if retry_call_kwargs is None:
+                    raise
 
-            logging.warning(
-                "[%sAdapter] Provider rejected tool_choice for model '%s'; retrying without tool_choice.",
-                self.provider_label,
-                call_kwargs.get("model"),
-            )
-            return self.client.chat.completions.create(**retry_call_kwargs)
+                logging.warning(
+                    "[%sAdapter] Provider rejected tool_choice for model '%s'; retrying without tool_choice.",
+                    self.provider_label,
+                    call_kwargs.get("model"),
+                )
+                return self.client.chat.completions.create(**retry_call_kwargs)
 
     @staticmethod
     def _build_retry_without_tool_choice_kwargs(

{iatoolkit-2.44.2 → iatoolkit-2.44.4}/src/iatoolkit/services/profile_service.py

@@ -6,7 +6,7 @@
 from injector import inject
 from iatoolkit.repositories.profile_repo import ProfileRepo
 from iatoolkit.services.i18n_service import I18nService
-from iatoolkit.repositories.models import User, Company
+from iatoolkit.repositories.models import User, Company, user_company
 from flask_bcrypt import check_password_hash
 from flask import request, has_request_context
 from iatoolkit.common.session_manager import SessionManager
@@ -24,6 +24,7 @@ import logging
 from html import escape
 from datetime import datetime
 from typing import List, Dict
+from sqlalchemy import update
 from iatoolkit.common.interfaces.signup_policy_resolver import SignupPolicyResolver
 from iatoolkit.services.signup_policy_resolver import AllowAllSignupPolicyResolver
 
@@ -71,6 +72,10 @@ class ProfileService:
             text = fallback
         return text.lower()
 
+    @staticmethod
+    def _normalize_email_value(email: str | None) -> str:
+        return str(email or "").strip().lower()
+
     def _resolve_google_names(self, email: str, google_identity: GoogleIdentity) -> tuple[str, str]:
         given_name = str(google_identity.given_name or "").strip()
         family_name = str(google_identity.family_name or "").strip()
@@ -116,6 +121,30 @@ class ProfileService:
             'message': 'Login ok',
         }
 
+    def _promote_bootstrap_owner_if_needed(self, company: Company, user: User) -> None:
+        params = company.parameters if isinstance(company.parameters, dict) else {}
+        pending_admin_email = self._normalize_email_value(params.get("bootstrap_admin_email"))
+        user_email = self._normalize_email_value(getattr(user, "email", ""))
+
+        if not pending_admin_email or pending_admin_email != user_email:
+            return
+
+        self.profile_repo.session.execute(
+            update(user_company)
+            .where(
+                user_company.c.user_id == user.id,
+                user_company.c.company_id == company.id,
+            )
+            .values(role="admin")
+        )
+
+        updated_params = dict(params)
+        updated_params.pop("bootstrap_admin_email", None)
+        updated_params["workspace_owner_email"] = user_email
+        company.parameters = updated_params
+        self.profile_repo.session.add(company)
+        self.profile_repo.session.commit()
+
     def _link_user_to_google(self, user: User, google_identity: GoogleIdentity):
         user.auth_method = 'google'
         user.google_sub = google_identity.subject
@@ -574,6 +603,7 @@ class ProfileService:
                     # add new company to existing user
                     existing_user.companies.append(company)
                     self.profile_repo.save_user(existing_user)
+                    self._promote_bootstrap_owner_if_needed(company, existing_user)
                     return {"message": self.i18n_service.t('flash_messages.user_associated_success')}
 
             # add the new user
@@ -610,6 +640,7 @@ class ProfileService:
 
             # and create in the database
             self.profile_repo.create_user(new_user)
+            self._promote_bootstrap_owner_if_needed(company, new_user)
 
             # send email with verification
             if not cfg or cfg.get('verify_account', True):

{iatoolkit-2.44.2 → iatoolkit-2.44.4/src/iatoolkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iatoolkit
-Version: 2.44.2
+Version: 2.44.4
 Summary: IAToolkit
 Author: Fernando Libedinsky
 License-Expression: MIT