Merge branch 'develop' into bs/removed_outdated_code

cvat-ai · Nov 29, 2024 · 9eadbc3 · 9eadbc3
2 parents ff12331 + 86deaff
commit 9eadbc3
Show file tree

Hide file tree

Showing 31 changed files with 801 additions and 214 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,6 +4,7 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+
         {
             "name": "REST API tests: Attach to server",
             "type": "debugpy",
@@ -168,7 +169,7 @@
                 "CVAT_SERVERLESS": "1",
                 "ALLOWED_HOSTS": "*",
                 "DJANGO_LOG_SERVER_HOST": "localhost",
-                "DJANGO_LOG_SERVER_PORT": "8282"
+                "DJANGO_LOG_SERVER_PORT": "8282",
             },
             "args": [
                 "runserver",
@@ -178,7 +179,7 @@
             ],
             "django": true,
             "cwd": "${workspaceFolder}",
-            "console": "internalConsole"
+            "console": "internalConsole",
         },
         {
             "name": "server: chrome",
@@ -360,6 +361,28 @@
             },
             "console": "internalConsole"
         },
+        {
+            "name": "server: RQ - chunks",
+            "type": "debugpy",
+            "request": "launch",
+            "stopOnEntry": false,
+            "justMyCode": false,
+            "python": "${command:python.interpreterPath}",
+            "program": "${workspaceFolder}/manage.py",
+            "args": [
+                "rqworker",
+                "chunks",
+                "--worker-class",
+                "cvat.rqworker.SimpleWorker"
+            ],
+            "django": true,
+            "cwd": "${workspaceFolder}",
+            "env": {
+                "DJANGO_LOG_SERVER_HOST": "localhost",
+                "DJANGO_LOG_SERVER_PORT": "8282"
+            },
+            "console": "internalConsole"
+        },
         {
             "name": "server: migrate",
             "type": "debugpy",
@@ -553,7 +576,8 @@
                 "server: RQ - scheduler",
                 "server: RQ - quality reports",
                 "server: RQ - analytics reports",
-                "server: RQ - cleaning"
+                "server: RQ - cleaning",
+                "server: RQ - chunks",
             ]
         }
     ]

diff --git a/changelog.d/20241107_154537_andrey_worker_for_chunks.md b/changelog.d/20241107_154537_andrey_worker_for_chunks.md
@@ -0,0 +1,4 @@
+### Changed
+
+- Chunks are now prepared in a separate worker process
+  (<https://github.com/cvat-ai/cvat/pull/8618>)
diff --git a/changelog.d/20241127_132256_roman_pickle_models.md b/changelog.d/20241127_132256_roman_pickle_models.md
@@ -0,0 +1,4 @@
+### Added
+
+- \[SDK\] Model instances can now be pickled
+  (<https://github.com/cvat-ai/cvat/pull/8746>)
diff --git a/...en/templates/openapi-generator/model_templates/method_from_openapi_data_composed.mustache b/...en/templates/openapi-generator/model_templates/method_from_openapi_data_composed.mustache
@@ -22,7 +22,6 @@
             {{name}} ({{{dataType}}}):{{#description}} {{{.}}}.{{/description}} [optional]{{#defaultValue}} if omitted the server will use the default value of {{{.}}}{{/defaultValue}}  # noqa: E501
 {{/optionalVars}}
         """
-        from {{packageName}}.configuration import Configuration
 
 {{#requiredVars}}
 {{#defaultValue}}
@@ -32,7 +31,7 @@
         _check_type = kwargs.pop('_check_type', True)
         _spec_property_naming = kwargs.pop('_spec_property_naming', False)
         _path_to_item = kwargs.pop('_path_to_item', ())
-        _configuration = kwargs.pop('_configuration', Configuration())
+        _configuration = kwargs.pop('_configuration', None)
         _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
 
         self = super(OpenApiModel, cls).__new__(cls)

diff --git a/.../gen/templates/openapi-generator/model_templates/method_from_openapi_data_shared.mustache b/.../gen/templates/openapi-generator/model_templates/method_from_openapi_data_shared.mustache
@@ -27,7 +27,6 @@
 {{/optionalVars}}
 {{> model_templates/docstring_init_required_kwargs }}
 """
-        from {{packageName}}.configuration import Configuration
 
 {{#requiredVars}}
 {{#defaultValue}}
@@ -37,7 +36,7 @@
         _check_type = kwargs.pop('_check_type', True)
         _spec_property_naming = kwargs.pop('_spec_property_naming', True)
         _path_to_item = kwargs.pop('_path_to_item', ())
-        _configuration = kwargs.pop('_configuration', Configuration())
+        _configuration = kwargs.pop('_configuration', None)
         _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
 
         self = super(OpenApiModel, cls).__new__(cls)

diff --git a/.../gen/templates/openapi-generator/model_templates/method_from_openapi_data_simple.mustache b/.../gen/templates/openapi-generator/model_templates/method_from_openapi_data_simple.mustache
@@ -12,7 +12,6 @@
             value ({{{dataType}}}):{{#description}} {{{.}}}.{{/description}}{{#defaultValue}} if omitted defaults to {{{.}}}{{/defaultValue}}{{#allowableValues}}, must be one of [{{#enumVars}}{{{value}}}, {{/enumVars}}]{{/allowableValues}}  # noqa: E501
 {{> model_templates/docstring_init_required_kwargs }}
         """
-        from {{packageName}}.configuration import Configuration
 
         # required up here when default value is not given
         _path_to_item = kwargs.pop('_path_to_item', ())
@@ -39,7 +38,7 @@
 
         _check_type = kwargs.pop('_check_type', True)
         _spec_property_naming = kwargs.pop('_spec_property_naming', False)
-        _configuration = kwargs.pop('_configuration', Configuration())
+        _configuration = kwargs.pop('_configuration', None)
         _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
 
 {{> model_templates/invalid_pos_args }}

diff --git a/cvat-sdk/gen/templates/openapi-generator/model_templates/method_init_shared.mustache b/cvat-sdk/gen/templates/openapi-generator/model_templates/method_init_shared.mustache
@@ -30,7 +30,6 @@
 {{/optionalVars}}
 {{> model_templates/docstring_init_required_kwargs }}
 """
-        from {{packageName}}.configuration import Configuration
 
 {{#requiredVars}}
 {{^isReadOnly}}
@@ -42,7 +41,7 @@
         _check_type = kwargs.pop('_check_type', True)
         _spec_property_naming = kwargs.pop('_spec_property_naming', False)
         _path_to_item = kwargs.pop('_path_to_item', ())
-        _configuration = kwargs.pop('_configuration', Configuration())
+        _configuration = kwargs.pop('_configuration', None)
         _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
 
 {{> model_templates/invalid_pos_args }}

diff --git a/cvat-sdk/gen/templates/openapi-generator/model_templates/method_init_simple.mustache b/cvat-sdk/gen/templates/openapi-generator/model_templates/method_init_simple.mustache
@@ -20,7 +20,6 @@
             value ({{{dataType}}}):{{#description}} {{{.}}}.{{/description}}{{#defaultValue}} if omitted defaults to {{{.}}}{{/defaultValue}}{{#allowableValues}}, must be one of [{{#enumVars}}{{{value}}}, {{/enumVars}}]{{/allowableValues}}  # noqa: E501
 {{> model_templates/docstring_init_required_kwargs }}
         """
-        from {{packageName}}.configuration import Configuration
 
         # required up here when default value is not given
         _path_to_item = kwargs.pop('_path_to_item', ())
@@ -45,7 +44,7 @@
 
         _check_type = kwargs.pop('_check_type', True)
         _spec_property_naming = kwargs.pop('_spec_property_naming', False)
-        _configuration = kwargs.pop('_configuration', Configuration())
+        _configuration = kwargs.pop('_configuration', None)
         _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
 
 {{> model_templates/invalid_pos_args }}

diff --git a/cvat-sdk/gen/templates/openapi-generator/model_utils.mustache b/cvat-sdk/gen/templates/openapi-generator/model_utils.mustache
@@ -354,6 +354,13 @@ class OpenApiModel(object):
         new_inst = new_cls._new_from_openapi_data(*args, **kwargs)
         return new_inst
 
+    def __setstate__(self, state):
+        # This is the same as the default implementation. We override it,
+        # because unpickling attempts to access `obj.__setstate__` on an uninitialized
+        # object, and if this method is not defined, it results in a call to `__getattr__`.
+        # This fails, because `__getattr__` relies on `self._data_store`, which doesn't
+        # exist in an uninitialized object.
+        self.__dict__.update(state)
 
 class ModelSimple(OpenApiModel):
     """the parent class of models whose type != object in their
@@ -1084,7 +1091,7 @@ def deserialize_file(response_data, configuration, content_disposition=None):
         (file_type): the deserialized file which is open
             The user is responsible for closing and reading the file
     """
-    fd, path = tempfile.mkstemp(dir=configuration.temp_folder_path)
+    fd, path = tempfile.mkstemp(dir=configuration.temp_folder_path if configuration else None)
     os.close(fd)
     os.remove(path)
 
@@ -1263,27 +1270,21 @@ def validate_and_convert_types(input_value, required_types_mixed, path_to_item,
     input_class_simple = get_simple_class(input_value)
     valid_type = is_valid_type(input_class_simple, valid_classes)
     if not valid_type:
-        if (configuration
-                or (input_class_simple == dict
-                    and dict not in valid_classes)):
-            # if input_value is not valid_type try to convert it
-            converted_instance = attempt_convert_item(
-                input_value,
-                valid_classes,
-                path_to_item,
-                configuration,
-                spec_property_naming,
-                key_type=False,
-                must_convert=True,
-                check_type=_check_type
-            )
-            return converted_instance
-        else:
-            raise get_type_error(input_value, path_to_item, valid_classes,
-                                 key_type=False)
+        # if input_value is not valid_type try to convert it
+        converted_instance = attempt_convert_item(
+            input_value,
+            valid_classes,
+            path_to_item,
+            configuration,
+            spec_property_naming,
+            key_type=False,
+            must_convert=True,
+            check_type=_check_type
+        )
+        return converted_instance
 
     # input_value's type is in valid_classes
-    if len(valid_classes) > 1 and configuration:
+    if len(valid_classes) > 1:
         # there are valid classes which are not the current class
         valid_classes_coercible = remove_uncoercible(
             valid_classes, input_value, spec_property_naming, must_convert=False)