INTEG-3042 - upgrade pydantic

ceciliastevens · ceciliastevens · commit 3052f4fdaf04 · 2025-12-15T10:10:45.000-05:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -28,7 +28,7 @@ dependencies = [
   "requests",
   "requests-toolbelt",
   "rich",
-  "pydantic>=2.11,<2.12",
+  "pydantic>=2.11",
   "pydantic-settings",
   "isodate",
   "python-dateutil",
diff --git a/src/_incydr_cli/cmds/trusted_activities.py b/src/_incydr_cli/cmds/trusted_activities.py
@@ -334,7 +334,7 @@ def _output_trusted_activity(
         t.add_column("Action Groups")
 
         # exclude activity action groups from the info panel
-        include = list(TrustedActivity.__fields__.keys())
+        include = list(TrustedActivity.model_fields.keys())
         include.remove("activity_action_groups")
         t.add_row(
             model_as_card(
diff --git a/src/_incydr_sdk/utils.py b/src/_incydr_sdk/utils.py
@@ -182,7 +182,11 @@ class Parent(BaseModel):
         model = type(model)
     for name, field in model.model_fields.items():
         model_field_type = _get_model_type(field.annotation)
-        if _is_single(field.annotation) and issubclass(model_field_type, BaseModel):
+        if (
+            _is_single(field.annotation)
+            and isinstance(model_field_type, type)
+            and issubclass(model_field_type, BaseModel)
+        ):
             for child_name in flatten_fields(model_field_type):
                 yield f"{name}.{child_name}"
         else:
@@ -239,13 +243,17 @@ def _is_single(type) -> bool:
     return True
 
 
-def _get_model_type(type) -> Type[BaseModel]:
+def _get_model_type(inputType) -> Type[BaseModel]:
     """Given a type annotation, gets the type that subclasses BaseModel"""
-    if issubclass(type, BaseModel):
-        return type
-    elif get_origin(type):
+    if isinstance(inputType, type) and issubclass(inputType, BaseModel):
+        return inputType
+    elif get_origin(inputType):
         return next(
-            (_get_model_type(item) for item in get_args(type) if _get_model_type(item)),
+            (
+                _get_model_type(item)
+                for item in get_args(inputType)
+                if _get_model_type(item)
+            ),
             None,
         )
     return None
