Update pydantic and change code to use pydantic.v1 namespace

pyproject.toml

@@ -26,7 +26,7 @@ dependencies = [
   "jmespath",
   "paho-mqtt<2.0.0",
   "pyaes",
-  "pydantic<2.0.0",
+  "pydantic (>=1.10.17,<3.0.0)",
   "python-dateutil",
   "PyYAML",
   "redis<5.0.0",

tcex/api/tc/ti_transform/model/transform_model.py

@@ -5,7 +5,7 @@
 
 # third-party
 from jmespath import compile as jmespath_compile
-from pydantic import BaseModel, Extra, Field, root_validator, validator
+from pydantic.v1 import BaseModel, Extra, Field, root_validator, validator
 
 
 # reusable validator

tcex/api/tc/v3/_gen/_gen_abc.py

@@ -9,7 +9,7 @@
 from textwrap import TextWrapper
 
 # third-party
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 from requests import Session
 from requests.exceptions import ProxyError
 

tcex/api/tc/v3/_gen/_gen_filter_abc.py

@@ -6,7 +6,7 @@
 from typing import Any
 
 # third-party
-from pydantic import ValidationError
+from pydantic.v1 import ValidationError
 from requests.exceptions import ProxyError
 
 # first-party

tcex/api/tc/v3/_gen/model/_filter_model.py

@@ -1,7 +1,7 @@
 """TcEx Framework Module"""
 
 # third-party
-from pydantic import BaseModel, Extra, Field, validator
+from pydantic.v1 import BaseModel, Extra, Field, validator
 
 # first-party
 from tcex.pleb.cached_property import cached_property

tcex/api/tc/v3/_gen/model/_property_model.py

@@ -1,7 +1,7 @@
 """TcEx Framework Module"""
 
 # third-party
-from pydantic import BaseModel, Extra, Field, validator
+from pydantic.v1 import BaseModel, Extra, Field, validator
 
 # first-party
 from tcex.pleb.cached_property import cached_property

tcex/api/tc/v3/artifact_types/artifact_type_model.py

@@ -2,7 +2,7 @@
 
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/artifacts/artifact_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/attribute_types/attribute_type_model.py

@@ -2,7 +2,7 @@
 
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/attributes/attribute_model.py

@@ -4,7 +4,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field
+from pydantic.v1 import BaseModel, Extra, Field
 
 # first-party
 from tcex.util import Util

tcex/api/tc/v3/case_attributes/case_attribute_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/cases/case_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/file_actions/file_action_model.py

@@ -3,7 +3,7 @@
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/file_occurrences/file_occurrence_model.py

@@ -4,7 +4,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/group_attributes/group_attribute_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/groups/group_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/indicator_attributes/indicator_attribute_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/indicators/indicator_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/intel_requirements/categories/category_model.py

@@ -2,7 +2,7 @@
 
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/intel_requirements/intel_req_type_model.py

@@ -3,7 +3,7 @@
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 
 # third-party
-from pydantic import Extra, Field
+from pydantic.v1 import Extra, Field
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/intel_requirements/intel_requirement_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/intel_requirements/keyword_sections/keyword_section_model.py

@@ -3,7 +3,7 @@
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 
 # third-party
-from pydantic import Field, PrivateAttr
+from pydantic.v1 import Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/intel_requirements/results/result_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/intel_requirements/subtypes/subtype_model.py

@@ -2,7 +2,7 @@
 
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/notes/note_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/security/assignee_model.py

@@ -3,7 +3,7 @@
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 
 # third-party
-from pydantic import Field, validator
+from pydantic.v1 import Field, validator
 
 # first-party
 from tcex.api.tc.v3.security.assignee_user_group_model import AssigneeUserGroupModel

tcex/api/tc/v3/security/assignee_user_group_model.py

@@ -3,7 +3,7 @@
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 
 # third-party
-from pydantic import Field
+from pydantic.v1 import Field
 
 # first-party
 from tcex.api.tc.v3.security.user_groups.user_group_model import UserGroupModel

tcex/api/tc/v3/security/assignee_user_model.py

@@ -3,7 +3,7 @@
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 
 # third-party
-from pydantic import Field
+from pydantic.v1 import Field
 
 # first-party
 from tcex.api.tc.v3.security.users.user_model import UserModel

tcex/api/tc/v3/security/owner_roles/owner_role_model.py

@@ -2,7 +2,7 @@
 
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/security/owners/owner_model.py

@@ -2,7 +2,7 @@
 
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/security/system_roles/system_role_model.py

@@ -2,7 +2,7 @@
 
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/security/task_assignee_model.py

@@ -6,7 +6,7 @@
 from enum import Enum
 
 # third-party
-from pydantic import BaseModel, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.security.users.user_model import UserModel

tcex/api/tc/v3/security/user_groups/user_group_model.py

@@ -2,7 +2,7 @@
 
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/security/users/user_model.py

@@ -2,7 +2,7 @@
 
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/security_labels/security_label_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/tags/mitre_tags.py

@@ -5,7 +5,7 @@
 import re
 
 # third-party
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 # first-party
 from tcex.logger.trace_logger import TraceLogger

tcex/api/tc/v3/tags/naics_tags.py

@@ -4,7 +4,7 @@
 import logging
 
 # third-party
-from pydantic import BaseModel
+from pydantic.v1 import BaseModel
 
 # first-party
 from tcex.logger.trace_logger import TraceLogger

tcex/api/tc/v3/tags/tag_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/tasks/task_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/v3_model_abc.py

@@ -10,7 +10,7 @@
 from typing import Any, Self
 
 # third-party
-from pydantic import BaseModel, PrivateAttr
+from pydantic.v1 import BaseModel, PrivateAttr
 
 # first-party
 from tcex.logger.trace_logger import TraceLogger

tcex/api/tc/v3/victim_assets/victim_asset_model.py

@@ -2,7 +2,7 @@
 
 # pylint: disable=no-member,no-self-argument,wrong-import-position
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/victim_attributes/victim_attribute_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/victims/victim_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC

tcex/api/tc/v3/workflow_events/workflow_event_model.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 
 # third-party
-from pydantic import BaseModel, Extra, Field, PrivateAttr, validator
+from pydantic.v1 import BaseModel, Extra, Field, PrivateAttr, validator
 
 # first-party
 from tcex.api.tc.v3.v3_model_abc import V3ModelABC