Feat/update pydantic - Support for Pydantic V2

.github/workflows/python.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v3

.gitlab-ci.yml

@@ -14,9 +14,6 @@ stages:
    - pip install -r test-requirements.txt
    - pytest --cov=infisicalapi_client
 
-pytest-3.7:
-  extends: .pytest
-  image: python:3.7-alpine
 pytest-3.8:
   extends: .pytest
   image: python:3.8-alpine

.travis.yml

@@ -1,7 +1,6 @@
 # ref: https://docs.travis-ci.com/user/languages/python
 language: python
 python:
-  - "3.7"
   - "3.8"
   - "3.9"
   - "3.10"

README.md

@@ -4,7 +4,7 @@ The Infisical SDK provides a convenient way to interact with the Infisical API.
 
 ## Requirements
 
-Python 3.7+
+Python 3.8+
 
 ## Installation
 

infisicalapi_client/models/api_status_get200_response.py

@@ -19,7 +19,7 @@
 
 from datetime import datetime
 from typing import Optional
-from pydantic import BaseModel, Field, StrictBool, StrictStr, validator
+from pydantic import field_validator, ConfigDict, BaseModel, Field, StrictBool, StrictStr
 
 class ApiStatusGet200Response(BaseModel):
     """
@@ -34,17 +34,14 @@ class ApiStatusGet200Response(BaseModel):
     saml_default_org_slug: Optional[StrictStr] = Field(default=None, alias="samlDefaultOrgSlug")
     __properties = ["date", "message", "emailConfigured", "inviteOnlySignup", "redisConfigured", "secretScanningConfigured", "samlDefaultOrgSlug"]
 
-    @validator('message')
+    @field_validator('message')
+    @classmethod
     def message_validate_enum(cls, value):
         """Validates the enum"""
         if value not in ('Ok'):
             raise ValueError("must be one of enum values ('Ok')")
         return value
-
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""

infisicalapi_client/models/api_v1_access_approvals_policies_get200_response.py

@@ -19,20 +19,17 @@
 
 
 from typing import List
-from pydantic import BaseModel, Field, conlist
+from pydantic import ConfigDict, BaseModel, Field
 from infisicalapi_client.models.api_v1_access_approvals_policies_get200_response_approvals_inner import ApiV1AccessApprovalsPoliciesGet200ResponseApprovalsInner
+from typing_extensions import Annotated
 
 class ApiV1AccessApprovalsPoliciesGet200Response(BaseModel):
     """
     ApiV1AccessApprovalsPoliciesGet200Response
     """
-    approvals: conlist(ApiV1AccessApprovalsPoliciesGet200ResponseApprovalsInner) = Field(...)
+    approvals: Annotated[List[ApiV1AccessApprovalsPoliciesGet200ResponseApprovalsInner], Field()] = Field(...)
     __properties = ["approvals"]
-
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""

infisicalapi_client/models/api_v1_access_approvals_policies_get200_response_approvals_inner.py

@@ -19,8 +19,9 @@
 
 from datetime import datetime
 from typing import List, Optional, Union
-from pydantic import BaseModel, Field, StrictFloat, StrictInt, StrictStr, conlist
+from pydantic import ConfigDict, BaseModel, Field, StrictFloat, StrictInt, StrictStr
 from infisicalapi_client.models.api_v1_secret_approvals_get200_response_approvals_inner_environment import ApiV1SecretApprovalsGet200ResponseApprovalsInnerEnvironment
+from typing_extensions import Annotated
 
 class ApiV1AccessApprovalsPoliciesGet200ResponseApprovalsInner(BaseModel):
     """
@@ -36,13 +37,9 @@ class ApiV1AccessApprovalsPoliciesGet200ResponseApprovalsInner(BaseModel):
     enforcement_level: Optional[StrictStr] = Field(default='hard', alias="enforcementLevel")
     environment: ApiV1SecretApprovalsGet200ResponseApprovalsInnerEnvironment = Field(...)
     project_id: StrictStr = Field(default=..., alias="projectId")
-    approvers: conlist(StrictStr) = Field(...)
+    approvers: Annotated[List[StrictStr], Field()] = Field(...)
     __properties = ["id", "name", "secretPath", "approvals", "envId", "createdAt", "updatedAt", "enforcementLevel", "environment", "projectId", "approvers"]
-
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""

infisicalapi_client/models/api_v1_access_approvals_policies_policy_id_patch_request.py

@@ -19,20 +19,22 @@
 
 
 from typing import List, Optional, Union
-from pydantic import BaseModel, Field, StrictStr, confloat, conint, conlist, validator
+from pydantic import field_validator, ConfigDict, BaseModel, Field, StrictStr
+from typing_extensions import Annotated
 
 class ApiV1AccessApprovalsPoliciesPolicyIdPatchRequest(BaseModel):
     """
     ApiV1AccessApprovalsPoliciesPolicyIdPatchRequest
     """
     name: Optional[StrictStr] = None
     secret_path: Optional[StrictStr] = Field(default=None, alias="secretPath")
-    approvers: conlist(StrictStr, min_items=1) = Field(...)
-    approvals: Optional[Union[confloat(ge=1, strict=True), conint(ge=1, strict=True)]] = 1
+    approvers: Annotated[List[StrictStr], Field(min_length=1)] = Field(...)
+    approvals: Optional[Union[Annotated[float, Field(ge=1, strict=True)], Annotated[int, Field(ge=1, strict=True)]]] = 1
     enforcement_level: Optional[StrictStr] = Field(default='hard', alias="enforcementLevel")
     __properties = ["name", "secretPath", "approvers", "approvals", "enforcementLevel"]
 
-    @validator('enforcement_level')
+    @field_validator('enforcement_level')
+    @classmethod
     def enforcement_level_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
@@ -41,11 +43,7 @@ def enforcement_level_validate_enum(cls, value):
         if value not in ('hard', 'soft'):
             raise ValueError("must be one of enum values ('hard', 'soft')")
         return value
-
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""

infisicalapi_client/models/api_v1_access_approvals_policies_post_request.py

@@ -19,7 +19,8 @@
 
 
 from typing import List, Optional, Union
-from pydantic import BaseModel, Field, StrictStr, confloat, conint, conlist, validator
+from pydantic import field_validator, ConfigDict, BaseModel, Field, StrictStr
+from typing_extensions import Annotated
 
 class ApiV1AccessApprovalsPoliciesPostRequest(BaseModel):
     """
@@ -29,12 +30,13 @@ class ApiV1AccessApprovalsPoliciesPostRequest(BaseModel):
     name: Optional[StrictStr] = None
     secret_path: Optional[StrictStr] = Field(default='/', alias="secretPath")
     environment: StrictStr = Field(...)
-    approvers: conlist(StrictStr, min_items=1) = Field(...)
-    approvals: Optional[Union[confloat(ge=1, strict=True), conint(ge=1, strict=True)]] = 1
+    approvers: Annotated[List[StrictStr], Field(min_length=1)] = Field(...)
+    approvals: Optional[Union[Annotated[float, Field(ge=1, strict=True)], Annotated[int, Field(ge=1, strict=True)]]] = 1
     enforcement_level: Optional[StrictStr] = Field(default='hard', alias="enforcementLevel")
     __properties = ["projectSlug", "name", "secretPath", "environment", "approvers", "approvals", "enforcementLevel"]
 
-    @validator('enforcement_level')
+    @field_validator('enforcement_level')
+    @classmethod
     def enforcement_level_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
@@ -43,11 +45,7 @@ def enforcement_level_validate_enum(cls, value):
         if value not in ('hard', 'soft'):
             raise ValueError("must be one of enum values ('hard', 'soft')")
         return value
-
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""

infisicalapi_client/models/api_v1_access_approvals_requests_count_get200_response.py

@@ -19,7 +19,7 @@
 
 
 from typing import Union
-from pydantic import BaseModel, Field, StrictFloat, StrictInt
+from pydantic import ConfigDict, BaseModel, Field, StrictFloat, StrictInt
 
 class ApiV1AccessApprovalsRequestsCountGet200Response(BaseModel):
     """
@@ -28,11 +28,7 @@ class ApiV1AccessApprovalsRequestsCountGet200Response(BaseModel):
     pending_count: Union[StrictFloat, StrictInt] = Field(default=..., alias="pendingCount")
     finalized_count: Union[StrictFloat, StrictInt] = Field(default=..., alias="finalizedCount")
     __properties = ["pendingCount", "finalizedCount"]
-
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""

infisicalapi_client/models/api_v1_access_approvals_requests_get200_response.py

@@ -19,20 +19,17 @@
 
 
 from typing import List
-from pydantic import BaseModel, Field, conlist
+from pydantic import ConfigDict, BaseModel, Field
 from infisicalapi_client.models.api_v1_access_approvals_requests_get200_response_requests_inner import ApiV1AccessApprovalsRequestsGet200ResponseRequestsInner
+from typing_extensions import Annotated
 
 class ApiV1AccessApprovalsRequestsGet200Response(BaseModel):
     """
     ApiV1AccessApprovalsRequestsGet200Response
     """
-    requests: conlist(ApiV1AccessApprovalsRequestsGet200ResponseRequestsInner) = Field(...)
+    requests: Annotated[List[ApiV1AccessApprovalsRequestsGet200ResponseRequestsInner], Field()] = Field(...)
     __properties = ["requests"]
-
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""

infisicalapi_client/models/api_v1_access_approvals_requests_get200_response_requests_inner.py

@@ -19,10 +19,11 @@
 
 from datetime import datetime
 from typing import Any, List, Optional
-from pydantic import BaseModel, Field, StrictBool, StrictStr, conlist
+from pydantic import ConfigDict, BaseModel, Field, StrictBool, StrictStr
 from infisicalapi_client.models.api_v1_access_approvals_requests_get200_response_requests_inner_policy import ApiV1AccessApprovalsRequestsGet200ResponseRequestsInnerPolicy
 from infisicalapi_client.models.api_v1_access_approvals_requests_get200_response_requests_inner_privilege import ApiV1AccessApprovalsRequestsGet200ResponseRequestsInnerPrivilege
 from infisicalapi_client.models.api_v1_access_approvals_requests_get200_response_requests_inner_reviewers_inner import ApiV1AccessApprovalsRequestsGet200ResponseRequestsInnerReviewersInner
+from typing_extensions import Annotated
 
 class ApiV1AccessApprovalsRequestsGet200ResponseRequestsInner(BaseModel):
     """
@@ -41,13 +42,9 @@ class ApiV1AccessApprovalsRequestsGet200ResponseRequestsInner(BaseModel):
     is_approved: StrictBool = Field(default=..., alias="isApproved")
     privilege: Optional[ApiV1AccessApprovalsRequestsGet200ResponseRequestsInnerPrivilege] = Field(...)
     policy: ApiV1AccessApprovalsRequestsGet200ResponseRequestsInnerPolicy = Field(...)
-    reviewers: conlist(ApiV1AccessApprovalsRequestsGet200ResponseRequestsInnerReviewersInner) = Field(...)
+    reviewers: Annotated[List[ApiV1AccessApprovalsRequestsGet200ResponseRequestsInnerReviewersInner], Field()] = Field(...)
     __properties = ["id", "policyId", "privilegeId", "requestedBy", "isTemporary", "temporaryRange", "permissions", "createdAt", "updatedAt", "environmentName", "isApproved", "privilege", "policy", "reviewers"]
-
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""

infisicalapi_client/models/api_v1_access_approvals_requests_get200_response_requests_inner_policy.py

@@ -19,7 +19,8 @@
 
 
 from typing import List, Optional, Union
-from pydantic import BaseModel, Field, StrictFloat, StrictInt, StrictStr, conlist
+from pydantic import ConfigDict, BaseModel, Field, StrictFloat, StrictInt, StrictStr
+from typing_extensions import Annotated
 
 class ApiV1AccessApprovalsRequestsGet200ResponseRequestsInnerPolicy(BaseModel):
     """
@@ -28,16 +29,12 @@ class ApiV1AccessApprovalsRequestsGet200ResponseRequestsInnerPolicy(BaseModel):
     id: StrictStr = Field(...)
     name: StrictStr = Field(...)
     approvals: Union[StrictFloat, StrictInt] = Field(...)
-    approvers: conlist(StrictStr) = Field(...)
+    approvers: Annotated[List[StrictStr], Field()] = Field(...)
     secret_path: Optional[StrictStr] = Field(default=None, alias="secretPath")
     env_id: StrictStr = Field(default=..., alias="envId")
     enforcement_level: StrictStr = Field(default=..., alias="enforcementLevel")
     __properties = ["id", "name", "approvals", "approvers", "secretPath", "envId", "enforcementLevel"]
-
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""

infisicalapi_client/models/api_v1_access_approvals_requests_get200_response_requests_inner_privilege.py

@@ -19,7 +19,7 @@
 
 from datetime import datetime
 from typing import Any, Optional
-from pydantic import BaseModel, Field, StrictBool, StrictStr
+from pydantic import ConfigDict, BaseModel, Field, StrictBool, StrictStr
 
 class ApiV1AccessApprovalsRequestsGet200ResponseRequestsInnerPrivilege(BaseModel):
     """
@@ -33,11 +33,7 @@ class ApiV1AccessApprovalsRequestsGet200ResponseRequestsInnerPrivilege(BaseModel
     temporary_access_end_time: Optional[datetime] = Field(default=None, alias="temporaryAccessEndTime")
     permissions: Optional[Any] = None
     __properties = ["membershipId", "isTemporary", "temporaryMode", "temporaryRange", "temporaryAccessStartTime", "temporaryAccessEndTime", "permissions"]
-
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""

infisicalapi_client/models/api_v1_access_approvals_requests_get200_response_requests_inner_reviewers_inner.py

@@ -19,7 +19,7 @@
 
 
 
-from pydantic import BaseModel, Field, StrictStr
+from pydantic import ConfigDict, BaseModel, Field, StrictStr
 
 class ApiV1AccessApprovalsRequestsGet200ResponseRequestsInnerReviewersInner(BaseModel):
     """
@@ -28,11 +28,7 @@ class ApiV1AccessApprovalsRequestsGet200ResponseRequestsInnerReviewersInner(Base
     member: StrictStr = Field(...)
     status: StrictStr = Field(...)
     __properties = ["member", "status"]
-
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""

infisicalapi_client/models/api_v1_access_approvals_requests_post200_response.py

@@ -19,7 +19,7 @@
 
 
 
-from pydantic import BaseModel, Field
+from pydantic import ConfigDict, BaseModel, Field
 from infisicalapi_client.models.api_v1_access_approvals_requests_post200_response_approval import ApiV1AccessApprovalsRequestsPost200ResponseApproval
 
 class ApiV1AccessApprovalsRequestsPost200Response(BaseModel):
@@ -28,11 +28,7 @@ class ApiV1AccessApprovalsRequestsPost200Response(BaseModel):
     """
     approval: ApiV1AccessApprovalsRequestsPost200ResponseApproval = Field(...)
     __properties = ["approval"]
-
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""

infisicalapi_client/models/api_v1_access_approvals_requests_post200_response_approval.py

@@ -19,7 +19,7 @@
 
 from datetime import datetime
 from typing import Any, Optional
-from pydantic import BaseModel, Field, StrictBool, StrictStr
+from pydantic import ConfigDict, BaseModel, Field, StrictBool, StrictStr
 
 class ApiV1AccessApprovalsRequestsPost200ResponseApproval(BaseModel):
     """
@@ -35,11 +35,7 @@ class ApiV1AccessApprovalsRequestsPost200ResponseApproval(BaseModel):
     created_at: datetime = Field(default=..., alias="createdAt")
     updated_at: datetime = Field(default=..., alias="updatedAt")
     __properties = ["id", "policyId", "privilegeId", "requestedBy", "isTemporary", "temporaryRange", "permissions", "createdAt", "updatedAt"]
-
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(populate_by_name=True, validate_assignment=True)
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""