Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added information about prefix #7147

Merged
merged 5 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions site/content/en/docs/manual/basics/attach-cloud-storage.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ Fill in the following fields:
| **Bucket name** | Name of the [Bucket](https://docs.aws.amazon.com/AmazonS3/latest/userguide/UsingBucket). |
| **Authorization type** | Depends on the bucket setup: <br><li>**Key id and secret access key pair**: available on [IAM](https://console.aws.amazon.com/iamv2/home?#/users). <br><li>**Anonymous access**: for anonymous access. Public access to the bucket must be enabled. |
| **Region** | (Optional) Choose a region from the list or add a new one. For more information, see [**Available locations**](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html#concepts-available-regions). |
| **Manifests** | Click **+ Add manifest** and enter the name of the manifest file with an extension. For example: `manifest.jsonl`. |
| **Prefix** | (Optional) Prefix is used to filter bucket content. By setting a default prefix, you ensure that only data from a specific folder in the cloud is used in CVAT. This will affect which files you see when creating a task with cloud data. |
| **Manifests** | (Optional) Click **+ Add manifest** and enter the name of the manifest file with an extension. For example: `manifest.jsonl`. |

<!--lint enable maximum-line-length-->

Expand Down Expand Up @@ -171,8 +172,8 @@ python <cvat repository>/utils/dataset_manifest/create.py --output-dir <yourfold
aws s3 cp <yourfolder>/manifest.jsonl <s3://bucket-name>
```

- For read-only permissions, use the download through the browser, click upload,
drag the manifest file to the page and click upload.
- For read-only permissions, use the download through the browser,
click upload, drag the manifest file to the page and click upload.

![](/images/aws-s3_tutorial_5.jpg)

Expand Down Expand Up @@ -279,17 +280,17 @@ Fill in the following fields:

<!--lint disable maximum-line-length-->

| CVAT | Google Cloud Storage |
| CVAT | Google Cloud Storage |
| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| **Display name** | Preferred display name for your storage. |
| **Description** | (Optional) Add description of storage. |
| **Provider** | From drop-down list select **Google Cloud Storage**. |
| **Bucket name** | Name of the bucket. You can find it on the [storage browser page](https://console.cloud.google.com/storage/browser). |
| **Authorization type** | Depends on the bucket setup: <br><li>**Authorized access**: Click on the **Key file** field and upload key file from computer. <br> **Advanced**: For self-hosted solution, if the key file was not attached, then environment variable `GOOGLE_APPLICATION_CREDENTIALS` that was specified for an environment will be used. For more information, see [Authenticate to Cloud services using client libraries](https://cloud.google.com/docs/authentication/client-libraries#setting_the_environment_variable).<br><li> **Anonymous access**: for anonymous access. Public access to the bucket must be enabled. |
| **Prefix** | (Optional) Used to filter data from the bucket. |
| **Prefix** | (Optional) Used to filter data from the bucket. By setting a default prefix, you ensure that only data from a specific folder in the cloud is used in CVAT. This will affect which files you see when creating a task with cloud data. |
| **Project ID** | [Project ID](#authorized-access). <br>For more information, see [projects page](https://cloud.google.com/resource-manager/docs/creating-managing-projects) and [cloud resource manager page](https://console.cloud.google.com/cloud-resource-manager). <br>**Note:** Project name does not match the project ID. |
| **Location** | (Optional) Choose a region from the list or add a new one. For more information, see [**Available locations**](https://cloud.google.com/storage/docs/locations#available-locations). |
| **Manifests** | Click **+ Add manifest** and enter the name of the manifest file with an extension. For example: `manifest.jsonl`. |
| **Manifests** | (Optional) Click **+ Add manifest** and enter the name of the manifest file with an extension. For example: `manifest.jsonl`. |

<!--lint enable maximum-line-length-->

Expand Down Expand Up @@ -429,7 +430,8 @@ Fill in the following fields:
| **Provider** | From drop-down list select **Azure Blob Container**. |
| **Container name`** | Name of the cloud storage container. |
| **Authorization type** | Depends on the container setup. <br>**[Account name and SAS token](https://docs.microsoft.com/en-us/azure/cognitive-services/translator/document-translation/create-sas-tokens?tabs=blobs)**: <ul><li>**Account name** enter storage account name. <li>**SAS token** is located in the **Shared access signature** section of your [Storage account](#sas-token).</ul>. **[Anonymous access](https://docs.microsoft.com/en-us/azure/storage/blobs/anonymous-read-access-configure?tabs=portal)**: for anonymous access **Allow enabling public access on containers** must be enabled. |
| **Manifests** | Click **+ Add manifest** and enter the name of the manifest file with an extention. For example: `manifest.jsonl`. |
| **Prefix** | (Optional) Used to filter data from the bucket. By setting a default prefix, you ensure that only data from a specific folder in the cloud is used in CVAT. This will affect which files you see when creating a task with cloud data. |
| **Manifests** | (Optional) Click **+ Add manifest** and enter the name of the manifest file with an extension. For example: `manifest.jsonl`. |

<!--lint enable maximum-line-length-->

Expand Down
16 changes: 7 additions & 9 deletions site/content/en/docs/manual/basics/create_an_annotation_task.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,7 @@ To add an attribute, do the following:
6. (Optional) To set the default attribute, hover over it with mouse cursor and
click on it. The default attribute will change color to blue.

![Default attribute](/images/default_attribute.jpg)

![Default attribute](/images/default_attribute.jpg)

To delete an attribute, click **Delete attribute**.

Expand All @@ -167,12 +166,12 @@ There are several ways to upload files:

<!--lint disable maximum-line-length-->

| Data source | Description |
| -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| My computer | Use this option to select files from your laptop or PC. <br> To select file: <br>1. Click on the **Select files** field: <br>![Select files](/images/select_files.jpg). <br> 2. Select files to upload. |
| Connected file share | **Advanced option**. <br>Upload files from a local or cloud shared folder. <br>**Note**, that you need to mount a fileshare first. <br>For more information, see [Share path](/docs/administration/basics/installation/#share-path) |
| Remote source | Enter a list of URLs (one per line) in the field. |
| Cloud Storage | **Advanced option**. <br>To upload files from cloud storage, type the cloud storage name, choose the manifest file, and select the required files. <br> For more information, see [Attach cloud storage](/docs/manual/basics/attach-cloud-storage/) |
| Data source | Description |
| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| My computer | Use this option to select files from your laptop or PC. <br> To select file: <br>1. Click on the **Select files** field: <br>![Select files](/images/select_files.jpg). <br> 2. Select files to upload. |
| Connected file share | **Advanced option**. <br>Upload files from a local or cloud shared folder. <br>**Note**, that you need to mount a fileshare first. <br>For more information, see [Share path](/docs/administration/basics/installation/#share-path) |
| Remote source | Enter a list of URLs (one per line) in the field. |
| Cloud Storage | **Advanced option**. <br>To upload files from cloud storage, type the cloud storage name, (otional) choose the manifest file, and select the required files. <br> For more information, see [Attach cloud storage](/docs/manual/basics/attach-cloud-storage/). Use the search feature to find a file (by file name) from the connected cloud storage. |
Marishka17 marked this conversation as resolved.
Show resolved Hide resolved

<!--lint enable maximum-line-length-->

Expand Down Expand Up @@ -240,7 +239,6 @@ To create a 3D task, you must prepare an archive with one of the following direc
{{< /tab >}}
{{< /tabpane >}}


## Advanced configuration

Use advanced configuration to set additional parameters for the task
Expand Down
Loading