Add support for pydantic v2 (#1577)

* Add support for pydantic v2
* Use pydantic v1 internally

lightly/openapi_generated/swagger_client/api/collaboration_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, constr, validator

lightly/openapi_generated/swagger_client/api/datasets_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, StrictBool, StrictInt, StrictStr, conint, conlist, constr, validator

lightly/openapi_generated/swagger_client/api/datasources_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, StrictBool, StrictStr, conint, constr, validator

lightly/openapi_generated/swagger_client/api/docker_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, StrictBool, StrictStr, conint, conlist, constr, validator

lightly/openapi_generated/swagger_client/api/embeddings2d_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, constr, validator

lightly/openapi_generated/swagger_client/api/embeddings_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, StrictStr, constr, validator

lightly/openapi_generated/swagger_client/api/jobs_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, StrictStr

lightly/openapi_generated/swagger_client/api/mappings_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, StrictStr, conint, constr, validator

lightly/openapi_generated/swagger_client/api/meta_data_configurations_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, constr, validator

lightly/openapi_generated/swagger_client/api/predictions_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, StrictBool, conint, conlist, constr, validator

lightly/openapi_generated/swagger_client/api/quota_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 

lightly/openapi_generated/swagger_client/api/samples_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, StrictBool, StrictStr, conint, constr, validator

lightly/openapi_generated/swagger_client/api/samplings_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, constr, validator

lightly/openapi_generated/swagger_client/api/scores_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, conint, constr, validator

lightly/openapi_generated/swagger_client/api/tags_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, StrictBool, StrictInt, StrictStr, conint, constr, validator

lightly/openapi_generated/swagger_client/api/teams_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import Field, StrictStr, constr, validator

lightly/openapi_generated/swagger_client/api/versioning_api.py

@@ -17,7 +17,12 @@
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import validate_arguments, ValidationError
+except ImportError:
+    # Pydantic v1
+    from pydantic import validate_arguments, ValidationError
 from typing_extensions import Annotated
 
 from pydantic import StrictStr

lightly/openapi_generated/swagger_client/api_response.py

@@ -2,7 +2,12 @@
 
 from __future__ import annotations
 from typing import Any, Dict, Optional
-from pydantic import Field, StrictInt, StrictStr
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import Field, StrictInt, StrictStr
+except ImportError:
+    # Pydantic v1
+    from pydantic import Field, StrictInt, StrictStr
 
 class ApiResponse:
     """

lightly/openapi_generated/swagger_client/models/active_learning_score_create_request.py

@@ -20,7 +20,14 @@
 
 
 from typing import List, Union
-from pydantic import Extra,  BaseModel, Field, StrictFloat, StrictInt, conlist, constr, validator
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import BaseModel, Field, StrictFloat, StrictInt, conlist, constr, validator
+    pass # Add pass to avoid empty try/except if no imports are generated for this file.
+except ImportError:
+    # Pydantic v1
+    from pydantic import BaseModel, Field, StrictFloat, StrictInt, conlist, constr, validator
+    pass # Add pass to avoid empty try/except if no imports are generated for this file.
 
 class ActiveLearningScoreCreateRequest(BaseModel):
     """
@@ -42,7 +49,7 @@ class Config:
         allow_population_by_field_name = True
         validate_assignment = True
         use_enum_values = True
-        extra = Extra.forbid
+        extra = "forbid"
 
     def to_str(self, by_alias: bool = False) -> str:
         """Returns the string representation of the model"""

lightly/openapi_generated/swagger_client/models/active_learning_score_data.py

@@ -20,7 +20,14 @@
 
 
 from typing import List, Union
-from pydantic import Extra,  BaseModel, Field, StrictFloat, StrictInt, conint, conlist, constr, validator
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import BaseModel, Field, StrictFloat, StrictInt, conint, conlist, constr, validator
+    pass # Add pass to avoid empty try/except if no imports are generated for this file.
+except ImportError:
+    # Pydantic v1
+    from pydantic import BaseModel, Field, StrictFloat, StrictInt, conint, conlist, constr, validator
+    pass # Add pass to avoid empty try/except if no imports are generated for this file.
 
 class ActiveLearningScoreData(BaseModel):
     """
@@ -59,7 +66,7 @@ class Config:
         allow_population_by_field_name = True
         validate_assignment = True
         use_enum_values = True
-        extra = Extra.forbid
+        extra = "forbid"
 
     def to_str(self, by_alias: bool = False) -> str:
         """Returns the string representation of the model"""

lightly/openapi_generated/swagger_client/models/active_learning_score_types_v2_data.py

@@ -20,7 +20,14 @@
 
 
 
-from pydantic import Extra,  BaseModel, Field, conint, constr, validator
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import BaseModel, Field, conint, constr, validator
+    pass # Add pass to avoid empty try/except if no imports are generated for this file.
+except ImportError:
+    # Pydantic v1
+    from pydantic import BaseModel, Field, conint, constr, validator
+    pass # Add pass to avoid empty try/except if no imports are generated for this file.
 
 class ActiveLearningScoreTypesV2Data(BaseModel):
     """
@@ -67,7 +74,7 @@ class Config:
         allow_population_by_field_name = True
         validate_assignment = True
         use_enum_values = True
-        extra = Extra.forbid
+        extra = "forbid"
 
     def to_str(self, by_alias: bool = False) -> str:
         """Returns the string representation of the model"""

lightly/openapi_generated/swagger_client/models/active_learning_score_v2_data.py

@@ -20,7 +20,14 @@
 
 
 from typing import List, Union
-from pydantic import Extra,  BaseModel, Field, StrictFloat, StrictInt, conint, conlist, constr, validator
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import BaseModel, Field, StrictFloat, StrictInt, conint, conlist, constr, validator
+    pass # Add pass to avoid empty try/except if no imports are generated for this file.
+except ImportError:
+    # Pydantic v1
+    from pydantic import BaseModel, Field, StrictFloat, StrictInt, conint, conlist, constr, validator
+    pass # Add pass to avoid empty try/except if no imports are generated for this file.
 
 class ActiveLearningScoreV2Data(BaseModel):
     """
@@ -68,7 +75,7 @@ class Config:
         allow_population_by_field_name = True
         validate_assignment = True
         use_enum_values = True
-        extra = Extra.forbid
+        extra = "forbid"
 
     def to_str(self, by_alias: bool = False) -> str:
         """Returns the string representation of the model"""

lightly/openapi_generated/swagger_client/models/annotation_savings.py

@@ -20,7 +20,14 @@
 
 
 
-from pydantic import Extra,  BaseModel, Field
+try:
+    # Pydantic >=v1.10.17
+    from pydantic.v1 import BaseModel, Field
+    pass # Add pass to avoid empty try/except if no imports are generated for this file.
+except ImportError:
+    # Pydantic v1
+    from pydantic import BaseModel, Field
+    pass # Add pass to avoid empty try/except if no imports are generated for this file.
 from lightly.openapi_generated.swagger_client.models.task_annotation_savings import TaskAnnotationSavings
 
 class AnnotationSavings(BaseModel):
@@ -37,7 +44,7 @@ class Config:
         allow_population_by_field_name = True
         validate_assignment = True
         use_enum_values = True
-        extra = Extra.forbid
+        extra = "forbid"
 
     def to_str(self, by_alias: bool = False) -> str:
         """Returns the string representation of the model"""

lightly/openapi_generated/swagger_client/models/api_error_code.py

@@ -20,7 +20,14 @@
 from aenum import no_arg  # type: ignore
 
 
-
+try:
+    # Pydantic >=v1.10.17
+
+    pass # Add pass to avoid empty try/except if no imports are generated for this file.
+except ImportError:
+    # Pydantic v1
+
+    pass # Add pass to avoid empty try/except if no imports are generated for this file.
 
 
 class ApiErrorCode(str, Enum):