Merge branch 'develop' into kl/improve-cs-form

cvat-ai · Oct 2, 2023 · 466c060 · 466c060
2 parents f220a0e + 92906a7
commit 466c060
Show file tree

Hide file tree

Showing 73 changed files with 216 additions and 2,492 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -0,0 +1,65 @@
+name: "\U0001F41E Bug Report"
+description: Create a bug report to help us fix it
+labels: ["bug"]
+body:
+- type: checkboxes
+  attributes:
+    label: Actions before raising this issue
+    options:
+    - label: I searched the existing issues and did not find anything similar.
+      required: true
+    - label: I read/searched [the docs](https://github.com/cvat-ai/cvat/tree/master#documentation)
+      required: true
+
+- type: textarea
+  attributes:
+    label: Steps to Reproduce
+    description: Provide a link to a live example or an unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant.
+    placeholder: |
+      1. Go to '...'
+      2. Click on '....'
+      3. Scroll down to '....'
+      4. See error
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Expected Behavior
+    description: A concise description of what you expected to happen.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Possible Solution
+    description: |
+      Not obligatory, but suggest a fix/reason for the bug, or ideas on how to implement the addition or change
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Context
+    description: |
+      How has this issue affected you? What are you trying to accomplish?
+      Providing context helps us come up with a solution that is most useful in the real world!
+
+      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Environment
+    description: |
+      Include relevant details about the environment you experienced
+    placeholder: |
+      - Git hash commit (`git log -1`):
+      - Docker version `docker version` (e.g. Docker 17.0.05):
+      - Are you using Docker Swarm or Kubernetes?
+      - Operating System and version (e.g. Linux, Windows, MacOS):
+      - Code example or link to GitHub repo or gist to reproduce problem:
+      - Other diagnostic information / logs:
+        <details>
+        <summary>Logs from `cvat` container</summary>
+        </details>
+    render: Markdown
+  validations:
+    required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,41 @@
+name: "\U0001F680 Feature Request"
+description: Suggest an idea for this project
+labels: ["enhancement"]
+body:
+- type: checkboxes
+  attributes:
+    label: Actions before raising this issue
+    options:
+    - label: I searched the existing issues and did not find anything similar.
+      required: true
+    - label: I read/searched [the docs](https://github.com/cvat-ai/cvat/tree/master#documentation)
+      required: true
+- type: textarea
+  attributes:
+    label: Is your feature request related to a problem? Please describe.
+    description: A clear and concise description of what the problem is.
+    placeholder: I'm always frustrated when I have to press this small button.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Describe the solution you'd like
+    description: A clear and concise description of what you want to happen.
+    placeholder: Make this button bigger
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Describe alternatives you've considered
+    description: A clear and concise description of any alternative solutions or features you've considered.
+    placeholder: I wanted to buy bigger display, but it would be too expensive.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Additional context
+    description: |
+      Add any other context or screenshots about the feature request here.
+      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+  validations:
+    required: false
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -339,22 +339,6 @@
             "env": {},
             "console": "internalConsole"
         },
-        {
-            "name": "server: git",
-            "type": "python",
-            "request": "launch",
-            "justMyCode": false,
-            "stopOnEntry": false,
-            "python": "${command:python.interpreterPath}",
-            "program": "${workspaceRoot}/manage.py",
-            "args": [
-                "update_git_states"
-            ],
-            "django": true,
-            "cwd": "${workspaceFolder}",
-            "env": {},
-            "console": "internalConsole"
-        },
         {
             "name": "server: RQ - cleaning",
             "type": "python",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,36 +6,61 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## \[Unreleased\]
+
 ### Added
+
+- New , form-based Issue templates for Github repository
 - TDB
 
 ### Changed
-- Do not reload annotation view when renew the job or update job state (<https://github.com/opencv/cvat/pull/6851>)
-- Now images from cloud buckets are loaded in parallel when preparing a chunk (<https://github.com/opencv/cvat/pull/6881>)
+
+- TDB
 
 ### Deprecated
+
 - TDB
 
 ### Removed
-- TDB
+
+- Functionality for synchronizing a task with a Git repository
+  (<https://github.com/opencv/cvat/pull/6904>)
 
 ### Fixed
+
+- Incorrectly determined video frame count when the video contains an MP4 edit list
+  (<https://github.com/opencv/cvat/pull/6929>)
+
+### Security
+
+- Security upgrade Pillow from 9.3.0 to 10.0.1
+  (<https://github.com/opencv/cvat/pull/6907>)
+- Security update cryptography from 41.0.3 to 41.0.4
+  (<https://github.com/opencv/cvat/pull/6914>)
+
+## \[2.7.2\] - 2023-09-25
+
+### Changed
+
+- Do not reload annotation view when renew the job or update job state (<https://github.com/opencv/cvat/pull/6851>)
+- Now images from cloud buckets are loaded in parallel when preparing a chunk (<https://github.com/opencv/cvat/pull/6881>)
+
+### Fixed
+
 - Downloading additional data from cloud storage if use_cache=true and job_file_mapping are specified
   (<https://github.com/opencv/cvat/pull/6879>)
 - Leaving an organization (<https://github.com/opencv/cvat/pull/6422>)
 - Validation on Cloud Storage form / error message on create task form (<https://github.com/opencv/cvat/pull/6890>)
 
 
-### Security
-- TDB
-
 ## \[2.7.1\] - 2023-09-15
+
 ### Fixed
 
 - Include cloud storage manifest file to selected files if manifest was used as data source (<https://github.com/opencv/cvat/pull/6850>)
 - Keep sequence of files when directories were specified in server_files (<https://github.com/opencv/cvat/pull/6850>)
 
 ## \[2.7.0\] - 2023-09-10
+
 ### Added
 
 - Admin actions for easy activation/deactivation of users (<https://github.com/opencv/cvat/pull/6314>)

diff --git a/Dockerfile b/Dockerfile
@@ -113,7 +113,6 @@ RUN apt-get update && \
         ca-certificates \
         curl \
         git \
-        git-lfs \
         libgeos-c1v5 \
         libgl1 \
         libgomp1 \
@@ -126,7 +125,6 @@ RUN apt-get update && \
         python3 \
         python3-distutils \
         python3-venv \
-        ssh \
         supervisor \
         tzdata \
     && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime && \
@@ -140,12 +138,7 @@ COPY --from=build-smokescreen /tmp/smokescreen /usr/local/bin/smokescreen
 # Add a non-root user
 ENV USER=${USER}
 ENV HOME /home/${USER}
-RUN adduser --shell /bin/bash --disabled-password --gecos "" ${USER} && \
-    if [ -z ${socks_proxy} ]; then \
-        echo export "GIT_SSH_COMMAND=\"ssh -o StrictHostKeyChecking=no -o ConnectTimeout=30\"" >> ${HOME}/.bashrc; \
-    else \
-        echo export "GIT_SSH_COMMAND=\"ssh -o StrictHostKeyChecking=no -o ConnectTimeout=30 -o ProxyCommand='nc -X 5 -x ${socks_proxy} %h %p'\"" >> ${HOME}/.bashrc; \
-    fi
+RUN adduser --shell /bin/bash --disabled-password --gecos "" ${USER}
 
 ARG CLAM_AV="no"
 RUN if [ "$CLAM_AV" = "yes" ]; then \
@@ -184,7 +177,6 @@ RUN if [ "${CVAT_DEBUG_ENABLED}" = 'yes' ]; then \
 COPY cvat/nginx.conf /etc/nginx/nginx.conf
 COPY --chown=${USER} components /tmp/components
 COPY --chown=${USER} supervisord/ ${HOME}/supervisord
-COPY --chown=${USER} ssh ${HOME}/.ssh
 COPY --chown=${USER} wait-for-it.sh manage.py backend_entrypoint.sh ${HOME}/
 COPY --chown=${USER} utils/ ${HOME}/utils
 COPY --chown=${USER} cvat/ ${HOME}/cvat

diff --git a/cvat-cli/requirements/base.txt b/cvat-cli/requirements/base.txt
@@ -1,3 +1,3 @@
 cvat-sdk~=2.8.0
-Pillow>=6.2.0
+Pillow>=10.0.1
 setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/cvat-cli/src/cvat_cli/cli.py b/cvat-cli/src/cvat_cli/cli.py
@@ -43,8 +43,6 @@ def tasks_create(
         annotation_path: str = "",
         annotation_format: str = "CVAT XML 1.1",
         status_check_period: int = 2,
-        dataset_repository_url: str = "",
-        lfs: bool = False,
         **kwargs,
     ) -> None:
         """
@@ -68,8 +66,6 @@ def tasks_create(
             annotation_path=annotation_path,
             annotation_format=annotation_format,
             status_check_period=status_check_period,
-            dataset_repository_url=dataset_repository_url,
-            use_lfs=lfs,
             pbar=DeferredTqdmProgressReporter(),
         )
         print("Created task id", task.id)

diff --git a/cvat-cli/src/cvat_cli/parser.py b/cvat-cli/src/cvat_cli/parser.py
@@ -193,17 +193,6 @@ def make_cmdline_parser() -> argparse.ArgumentParser:
         """
         ),
     )
-    task_create_parser.add_argument(
-        "--dataset_repository_url",
-        default="",
-        type=str,
-        help=textwrap.dedent(
-            """\
-            git repository to store annotations e.g.
-            https://github.com/user/repos [annotation/<anno_file_name.zip>]
-        """
-        ),
-    )
     task_create_parser.add_argument(
         "--frame_step",
         default=None,
@@ -232,12 +221,6 @@ def make_cmdline_parser() -> argparse.ArgumentParser:
         type=parse_label_arg,
         help="string or file containing JSON labels specification",
     )
-    task_create_parser.add_argument(
-        "--lfs",
-        default=False,
-        action="store_true",
-        help="using lfs for dataset repository (default: %(default)s)",
-    )
     task_create_parser.add_argument(
         "--project_id", default=None, type=int, help="project ID if project exists"
     )

diff --git a/cvat-sdk/cvat_sdk/core/client.py b/cvat-sdk/cvat_sdk/core/client.py
@@ -322,16 +322,6 @@ class CVAT_API_V2:
     def __init__(self, host: str):
         self.host = host.rstrip("/")
         self.base = self.host + "/api/"
-        self.git = self.host + "/git/repository/"
-
-    def git_create(self, task_id: int) -> str:
-        return self.git + f"create/{task_id}"
-
-    def git_check(self, rq_id: int) -> str:
-        return self.git + f"check/{rq_id}"
-
-    def git_get(self, task_id: int) -> str:
-        return self.git + f"get/{task_id}"
 
     def make_endpoint_url(
         self,