Merge pull request #2395 from tisnik/lcore-3473-added-new-common-models

LCORE-3473: added new common models

Author: tisnik

src/models/common/__init__.py

@@ -21,6 +21,11 @@
 from models.common.query import Attachment, SolrVectorSearchRequest
 from models.common.shields import CatalogShield
 from models.common.skills import SkillMetadata
+from models.common.tools import (
+    CatalogTool,
+    CatalogToolParameter,
+    ListedMcpTool,
+)
 from models.common.transcripts import Transcript, TranscriptMetadata
 from models.common.turn_summary import (
     MCPListToolsSummary,
@@ -37,11 +42,14 @@
     "Attachment",
     "CatalogModel",
     "CatalogShield",
+    "CatalogTool",
+    "CatalogToolParameter",
     "ConversationData",
     "ConversationDetails",
     "ConversationTurn",
     "FeedbackCategory",
     "HealthStatus",
+    "ListedMcpTool",
     "MCPListToolsSummary",
     "MCPServerAuthInfo",
     "MCPServerInfo",

src/utils/models_dumper.py

@@ -108,6 +108,8 @@
 
 common_models: list[type[BaseModel]] = [
     c.Attachment,
+    c.CatalogModel,
+    c.CatalogShield,
     c.ConversationData,
     c.ConversationDetails,
     c.ConversationTurn,
@@ -129,6 +131,9 @@
     c.Transcript,
     c.TranscriptMetadata,
     c.TurnSummary,
+    c.CatalogTool,
+    c.CatalogToolParameter,
+    c.ListedMcpTool,
 ]
 
 agents_models: list[type[BaseModel]] = [

tests/unit/utils/test_models_dumper.py

@@ -10439,6 +10439,9 @@ def test_dump_models_group_common(tmpdir: Path) -> None:
         "Transcript",
         "TranscriptMetadata",
         "TurnSummary",
+        "CatalogTool",
+        "CatalogToolParameter",
+        "ListedMcpTool",
     ]
     check_json_file_content(filename, expected_schemas)