Release Candidate v4.3.2 (#237)

Author: milosmns

.version

@@ -1 +1 @@
-4.2.3
+4.3.2

Pipfile.lock

@@ -2,7 +2,7 @@ openapi: 3.0.3
 info:
   title: The Agent's user-facing API
   description: The user-facing parts of The Agent's API service (excluding system-level endpoints, chat completion, maintenance endpoints, etc.)
-  version: 3.9.3
+  version: 4.3.1
   license:
     name: MIT
     url: https://opensource.org/licenses/MIT
@@ -317,6 +317,99 @@ paths:
       security:
         - bearerAuth: []
 
+  /user/{user_id_hex}/connect-key:
+    get:
+      summary: Get user's connect key
+      description: Retrieve the connect key for the specified user, used to merge profiles from different platforms
+      operationId: getConnectKey
+      tags: [Profile Connection]
+      parameters:
+        - name: user_id_hex
+          in: path
+          required: true
+          schema:
+            type: string
+          description: User ID in hexadecimal format
+      responses:
+        "200":
+          description: Connect key retrieved successfully
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ConnectKeyResponse"
+        "401":
+          $ref: "#/components/responses/UnauthorizedError"
+        "403":
+          $ref: "#/components/responses/ForbiddenError"
+        "500":
+          $ref: "#/components/responses/ServerError"
+      security:
+        - bearerAuth: []
+
+  /user/{user_id_hex}/regenerate-connect-key:
+    post:
+      summary: Regenerate user's connect key
+      description: Generate a new connect key for the specified user, invalidating the old key
+      operationId: regenerateConnectKey
+      tags: [Profile Connection]
+      parameters:
+        - name: user_id_hex
+          in: path
+          required: true
+          schema:
+            type: string
+          description: User ID in hexadecimal format
+      responses:
+        "200":
+          description: Connect key regenerated successfully
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ConnectKeyResponse"
+        "401":
+          $ref: "#/components/responses/UnauthorizedError"
+        "403":
+          $ref: "#/components/responses/ForbiddenError"
+        "500":
+          $ref: "#/components/responses/ServerError"
+      security:
+        - bearerAuth: []
+
+  /user/{user_id_hex}/connect-key/{connect_key}/merge:
+    post:
+      summary: Connect profiles from different platforms
+      description: Merge two user profiles from different platforms (e.g., Telegram and WhatsApp) into a single unified profile
+      operationId: connectProfiles
+      tags: [Profile Connection]
+      parameters:
+        - name: user_id_hex
+          in: path
+          required: true
+          schema:
+            type: string
+          description: User ID in hexadecimal format (the requester)
+        - name: connect_key
+          in: path
+          required: true
+          schema:
+            type: string
+          description: Connect key of the target profile to merge with
+      responses:
+        "200":
+          description: Profiles connected successfully
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/SettingsLinkResponse"
+        "401":
+          $ref: "#/components/responses/UnauthorizedError"
+        "403":
+          $ref: "#/components/responses/ForbiddenError"
+        "500":
+          $ref: "#/components/responses/ServerError"
+      security:
+        - bearerAuth: []
+
 components:
   securitySchemes:
     bearerAuth:
@@ -378,6 +471,10 @@ components:
     UserSettingsPayload:
       type: object
       properties:
+        full_name:
+          type: string
+          nullable: true
+          description: User's full name
         open_ai_key:
           type: string
           nullable: true
@@ -386,6 +483,10 @@ components:
           type: string
           nullable: true
           description: Anthropic API key
+        google_ai_key:
+          type: string
+          nullable: true
+          description: Google AI API key
         perplexity_key:
           type: string
           nullable: true
@@ -502,6 +603,10 @@ components:
           type: string
           nullable: true
           description: Anthropic API key (masked)
+        google_ai_key:
+          type: string
+          nullable: true
+          description: Google AI API key (masked)
         perplexity_key:
           type: string
           nullable: true
@@ -867,6 +972,26 @@ components:
       required:
         - settings_link
 
+    ConnectKeyResponse:
+      type: object
+      properties:
+        connect_key:
+          type: string
+          nullable: false
+          description: Connect key, used to merge profiles from different platforms
+      required:
+        - connect_key
+
+    SettingsLinkResponse:
+      type: object
+      properties:
+        settings_link:
+          type: string
+          nullable: false
+          description: Link to the settings page
+      required:
+        - settings_link
+
     ErrorResponse:
       type: object
       properties:

docs/open-api-users.yaml

@@ -11,6 +11,9 @@ def api_to_domain(payload: UserSettingsPayload, existing_user: User) -> UserSave
     # All fields are already stripped in the payload model validators
     user_save = UserSave(**existing_user.model_dump())
 
+    if payload.full_name is not None:
+        user_save.full_name = payload.full_name if payload.full_name else None
+
     if payload.open_ai_key is not None:
         user_save.open_ai_key = SecretStr(payload.open_ai_key) if payload.open_ai_key else None
     if payload.anthropic_key is not None:

src/api/mapper/user_mapper.py

@@ -0,0 +1,5 @@
+from pydantic import BaseModel
+
+
+class ConnectKeyResponse(BaseModel):
+    connect_key: str

src/api/model/connect_key_response.py

@@ -0,0 +1,5 @@
+from pydantic import BaseModel
+
+
+class SettingsLinkResponse(BaseModel):
+    settings_link: str

src/api/model/settings_link_response.py

@@ -4,6 +4,8 @@
 
 
 class UserSettingsPayload(BaseModel):
+    full_name: str | None = None
+
     open_ai_key: str | None = None
     anthropic_key: str | None = None
     google_ai_key: str | None = None
@@ -30,6 +32,7 @@ class UserSettingsPayload(BaseModel):
 
     # noinspection PyNestedDecorators
     @field_validator(
+        "full_name",
         "open_ai_key",
         "anthropic_key",
         "google_ai_key",

src/api/model/user_settings_payload.py

@@ -0,0 +1,45 @@
+from api.model.connect_key_response import ConnectKeyResponse
+from api.model.settings_link_response import SettingsLinkResponse
+from db.model.chat_config import ChatConfigDB
+from di.di import DI
+from features.connect.profile_connect_service import ProfileConnectService
+from util import log
+
+
+class ProfileConnectController:
+
+    __di: DI
+
+    def __init__(self, di: DI):
+        self.__di = di
+
+    def get_connect_key(self, user_id_hex: str) -> ConnectKeyResponse:
+        log.d(f"Fetching connect key for user '{user_id_hex}'")
+        user = self.__di.authorization_service.authorize_for_user(self.__di.invoker, user_id_hex)
+        return ConnectKeyResponse(connect_key = user.connect_key)
+
+    def regenerate_connect_key(self, user_id_hex: str) -> ConnectKeyResponse:
+        log.d(f"Regenerating connect key for user '{user_id_hex}'")
+        user = self.__di.authorization_service.authorize_for_user(self.__di.invoker, user_id_hex)
+
+        new_key = self.__di.profile_connect_service.regenerate_connect_key(user)
+        log.i(f"Successfully regenerated connect key for user '{user_id_hex}'")
+        return ConnectKeyResponse(connect_key = new_key)
+
+    def connect_profiles(
+        self,
+        user_id_hex: str,
+        target_connect_key: str,
+        chat_type: ChatConfigDB.ChatType,
+    ) -> SettingsLinkResponse:
+        normalized_connect_key = target_connect_key.strip().upper()
+        log.d(f"Connecting profiles for user '{user_id_hex}' with target key '{normalized_connect_key}'")
+        user = self.__di.authorization_service.authorize_for_user(self.__di.invoker, user_id_hex)
+        result, message = self.__di.profile_connect_service.connect_profiles(user, normalized_connect_key)
+
+        if result == ProfileConnectService.Result.failure:
+            raise ValueError(message)
+
+        settings_link_response = self.__di.settings_controller.create_settings_link(chat_type = chat_type)
+        log.i(f"Successfully connected profiles for user '{user_id_hex}'")
+        return settings_link_response

src/api/profile_connect_controller.py

@@ -7,6 +7,7 @@
 from api.mapper.user_mapper import api_to_domain, domain_to_api
 from api.model.chat_settings_payload import ChatSettingsPayload
 from api.model.external_tools_response import ExternalToolProviderResponse, ExternalToolResponse, ExternalToolsResponse
+from api.model.settings_link_response import SettingsLinkResponse
 from api.model.user_settings_payload import UserSettingsPayload
 from db.model.chat_config import ChatConfigDB
 from db.schema.chat_config import ChatConfig, ChatConfigSave
@@ -39,7 +40,11 @@ def __validate_settings_type(self, settings_type: str) -> SettingsType:
             raise ValueError(log.e(f"Invalid settings type '{settings_type}'"))
         return settings_type
 
-    def create_settings_link(self, raw_settings_type: str | None = None, chat_type: ChatConfigDB.ChatType | None = None) -> str:
+    def create_settings_link(
+        self,
+        raw_settings_type: str | None = None,
+        chat_type: ChatConfigDB.ChatType | None = None,
+    ) -> SettingsLinkResponse:
         chat_type = chat_type or self.__di.invoker_chat_type
         if not chat_type:
             raise ValueError(log.e("Chat type not provided and invoker_chat is not available"))
@@ -71,7 +76,7 @@ def create_settings_link(self, raw_settings_type: str | None = None, chat_type:
 
         valid_until = datetime.now() + timedelta(minutes = config.jwt_expires_in_minutes * 10)
         shortener = self.__di.url_shortener(long_url, valid_until = valid_until)
-        return shortener.execute()
+        return SettingsLinkResponse(settings_link = shortener.execute())
 
     def create_help_link(self, chat_type: ChatConfigDB.ChatType | None = None) -> str:
         chat_type = chat_type or self.__di.invoker_chat_type

src/api/settings_controller.py

@@ -0,0 +1,75 @@
+"""add_connect_key_to_users
+
+Revision ID: 5472fe3215da
+Revises: a0ecabe6256b
+Create Date: 2025-11-02 19:31:36.868557
+
+"""
+import secrets
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.orm import Session
+
+CONNECT_KEY_CHARS = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789"
+
+
+# revision identifiers, used by Alembic.
+revision: str = "5472fe3215da"
+down_revision: Union[str, None] = "a0ecabe6256b"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # Step 1: Add column as nullable first
+    op.add_column("simulants", sa.Column("connect_key", sa.String(), nullable = True))
+
+    # Step 2: Backfill existing users with unique connect keys
+    bind = op.get_bind()
+    session = Session(bind = bind)
+
+    # Get all existing users
+    users = session.execute(sa.text("SELECT id FROM simulants WHERE connect_key IS NULL")).fetchall()
+
+    for user_row in users:
+        user_id = user_row[0]
+        # Generate unique connect key for each user
+        connect_key = generate_unique_connect_key(session)
+        session.execute(
+            sa.text("UPDATE simulants SET connect_key = :key WHERE id = :id"),
+            {"key": connect_key, "id": user_id},
+        )
+
+    session.commit()
+
+    # Step 3: Make column non-nullable and add unique index
+    op.alter_column("simulants", "connect_key", nullable = False)
+    op.create_index(op.f("ix_simulants_connect_key"), "simulants", ["connect_key"], unique = True)
+
+
+def generate_unique_connect_key(session: Session) -> str:
+    max_attempts = 100
+    for attempt in range(max_attempts):
+        # Generate 12 random characters from allowed charset
+        key_chars = [secrets.choice(CONNECT_KEY_CHARS) for _ in range(12)]
+        formatted_key = f"{''.join(key_chars[0:4])}-{''.join(key_chars[4:8])}-{''.join(key_chars[8:12])}"
+
+        # Check uniqueness
+        result = session.execute(
+            sa.text("SELECT COUNT(*) FROM simulants WHERE connect_key = :key"),
+            {"key": formatted_key},
+        ).scalar()
+
+        if result == 0:
+            return formatted_key
+
+    raise ValueError(f"Failed to generate unique connect key after {max_attempts} attempts")
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_simulants_connect_key"), table_name = "simulants")
+    op.drop_column("simulants", "connect_key")
+    # ### end Alembic commands ###