Merge branch 'main' into develop

Author: frascuchon

.github/workflows/argilla-server.yml

@@ -4,6 +4,11 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+defaults:
+  run:
+    shell: bash -l {0}
+    working-directory: argilla-server
+
 on:
   workflow_dispatch:
   push:
@@ -31,11 +36,6 @@ jobs:
     name: Build `argilla-server` package
     runs-on: ubuntu-latest
 
-    defaults:
-      run:
-        shell: bash -l {0}
-        working-directory: argilla-server
-
     services:
       elasticsearch:
         image: docker.elastic.co/elasticsearch/elasticsearch:8.8.2
@@ -164,11 +164,6 @@ jobs:
       # IMPORTANT: this permission is mandatory for trusted publishing on PyPI
       id-token: write
 
-    defaults:
-      run:
-        shell: bash -l {0}
-        working-directory: ./argilla-server
-
     steps:
       - name: Checkout Code 🛎
         uses: actions/checkout@v4
@@ -182,13 +177,18 @@ jobs:
       - name: Setup PDM
         uses: pdm-project/setup-pdm@v4
         with:
+          python-version-file: argilla-server/pyproject.toml
+          cache-dependency-path: argilla-server/pdm.lock
           cache: true
 
       - name: Publish Package to PyPI test environment 🥪
-        run: pdm publish --no-build --repository testpypi
+        run: |
+          pdm publish --no-build --repository testpypi
 
       - name: Test Installing 🍿
-        run: pip install --index-url https://test.pypi.org/simple --no-deps argilla-server==${GITHUB_REF#refs/*/v}
+        run: |
+          pip install --index-url https://test.pypi.org/simple --no-deps argilla-server==${GITHUB_REF#refs/*/v}
 
       - name: Publish Package to PyPI 🥩
-        run: pdm publish --no-build
+        run: |
+          pdm publish --no-build

.github/workflows/argilla.build-python-package.yml

@@ -30,7 +30,7 @@ jobs:
           rm -rf dist && python -m build
 
       - name: Upload package artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: python-package
+          name: argilla
           path: argilla/dist

.github/workflows/argilla.yml

@@ -8,6 +8,14 @@ on:
   workflow_dispatch:
   workflow_call:
 
+  push:
+    tags:
+      - "*"
+    branches:
+      - main
+      - develop
+      - releases/**
+
   pull_request:
     paths:
       - "argilla/**"
@@ -111,14 +119,15 @@ jobs:
     defaults:
       run:
         shell: bash -l {0}
+        working-directory: argilla
     steps:
       - name: Checkout Code 🛎
         uses: actions/checkout@v4
 
       - name: Download python package
         uses: actions/download-artifact@v4
         with:
-          name: python-package
+          name: argilla
           path: dist
 
       - name: Publish Package to TestPyPI 🥪

argilla-frontend/components/feedback-task/container/fields/RecordMenu.vue

@@ -99,8 +99,8 @@ export default {
   :deep(.dropdown__content) {
     min-width: 100%;
     left: auto;
-    right: 0;
-    top: calc(100% + $base-space * 2);
+    right: 100%;
+    top: 0;
   }
 }
 </style>

argilla-frontend/components/feedback-task/container/fields/RecordMetadataInfo.vue

@@ -92,13 +92,13 @@ export default {
 <style lang="scss" scoped>
 .table-info {
   background: palette(white);
-  min-width: 460px;
+  min-width: 440px;
   border-radius: $border-radius-s;
   overflow: hidden;
   @include font-size(13px);
   box-shadow: $shadow;
   &__content {
-    max-height: 320px;
+    max-height: 280px;
     overflow: auto;
   }
   &__header {
@@ -112,6 +112,7 @@ export default {
     .--table & {
       background: $black-6;
       border-top: 1px solid $black-10;
+      border-bottom: 1px solid $black-10;
     }
   }
   &__row {
@@ -120,7 +121,7 @@ export default {
     gap: $base-space * 2;
     padding: $base-space $base-space * 2;
     .--table & {
-      border-top: 1px solid $black-10;
+      border-bottom: 1px solid $black-10;
       &:nth-child(even) {
         background: $black-4;
       }
@@ -135,6 +136,9 @@ export default {
     flex-basis: 44%;
     margin: 0;
     @include truncate;
+    .--intro & {
+      flex-basis: 100px;
+    }
   }
   &__value {
     display: flex;
@@ -145,6 +149,9 @@ export default {
     margin: 0;
     font-family: $quaternary-font-family;
     word-break: break-all;
+    .--intro & {
+      flex-basis: 100%;
+    }
   }
   &__copy {
     opacity: 0;

argilla-frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "argilla",
-  "version": "1.29.0-dev",
+  "version": "1.29.0",
   "private": true,
   "scripts": {
     "dev": "nuxt",

argilla-server/CHANGELOG.md

@@ -16,6 +16,8 @@ These are the section headers that we use:
 
 ## [Unreleased]()
 
+## [1.29.0](https://github.com/argilla-io/argilla/compare/v1.28.0...v1.29.0)
+
 ### Added
 
 - Added support for rating questions to include `0` as a valid value. ([#4858](https://github.com/argilla-io/argilla/pull/4858))
@@ -32,6 +34,10 @@ These are the section headers that we use:
 - Added `GET /api/v1/version` endpoint to get the current Argilla version. ([#162](https://github.com/argilla-io/argilla-server/pull/162))
 - Added `GET /api/v1/status` endpoint to get Argilla service status. ([#165](https://github.com/argilla-io/argilla-server/pull/165))
 
+## Fixed
+
+- Fixed error when fetching record with metadata values with visibility restrictions. ([#4906](https://github.com/argilla-io/argilla/pull/4906))
+
 ## [1.28.0](https://github.com/argilla-io/argilla-server/compare/v1.27.0...v1.28.0)
 
 ### Added

argilla-server/docker/server/Dockerfile

@@ -6,6 +6,7 @@ RUN python -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 RUN apt-get update && \
   apt-get install -y python-dev-is-python3 libpq-dev gcc && \
+  pip install --upgrade pip && \
   pip install uvicorn[standard] && \
   for wheel in /packages/*.whl; do pip install "$wheel"[server,postgresql]; done && \
   apt-get remove -y python-dev-is-python3 libpq-dev gcc && \

argilla-server/src/argilla_server/_version.py

@@ -13,4 +13,4 @@
 #  limitations under the License.
 
 # coding: utf-8
-__version__ = "1.29.0-dev"
+__version__ = "1.29.0"

argilla-server/src/argilla_server/apis/v1/handlers/datasets/records.py

@@ -13,7 +13,7 @@
 #  limitations under the License.
 
 import re
-from typing import Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Tuple, Union
 from uuid import UUID
 
 from fastapi import APIRouter, Depends, HTTPException, Query, Security, status
@@ -29,7 +29,7 @@
 from argilla_server.errors.future.base_errors import MISSING_VECTOR_ERROR_CODE
 from argilla_server.models import Dataset as DatasetModel
 from argilla_server.models import Record, User
-from argilla_server.policies import DatasetPolicyV1, authorize
+from argilla_server.policies import DatasetPolicyV1, RecordPolicyV1, authorize, is_authorized
 from argilla_server.schemas.v1.datasets import Dataset
 from argilla_server.schemas.v1.records import (
     Filters,
@@ -83,7 +83,6 @@
 _VALID_SORT_VALUES = tuple(sort.value for sort in SortOrder)
 _METADATA_PROPERTY_SORT_BY_REGEX = re.compile(r"^metadata\.(?P<name>(?=.*[a-z0-9])[a-z0-9_-]+)$")
 
-
 SortByQueryParamParsed = Annotated[
     Dict[str, str],
     Depends(
@@ -410,7 +409,7 @@ async def list_current_user_dataset_records(
     limit: int = Query(default=LIST_DATASET_RECORDS_LIMIT_DEFAULT, ge=1, le=LIST_DATASET_RECORDS_LIMIT_LE),
     current_user: User = Security(auth.get_current_user),
 ):
-    dataset = await _get_dataset_or_raise(db, dataset_id)
+    dataset = await _get_dataset_or_raise(db, dataset_id, with_metadata_properties=True)
 
     await authorize(current_user, DatasetPolicyV1.get(dataset))
 
@@ -427,6 +426,10 @@ async def list_current_user_dataset_records(
         sort_by_query_param=sort_by_query_param,
     )
 
+    for record in records:
+        record.dataset = dataset
+        record.metadata_ = await _filter_record_metadata_for_user(record, current_user)
+
     return Records(items=records, total=total)
 
 
@@ -570,8 +573,7 @@ async def search_current_user_dataset_records(
     limit: int = Query(default=LIST_DATASET_RECORDS_LIMIT_DEFAULT, ge=1, le=LIST_DATASET_RECORDS_LIMIT_LE),
     current_user: User = Security(auth.get_current_user),
 ):
-    dataset = await _get_dataset_or_raise(db, dataset_id, with_fields=True)
-
+    dataset = await _get_dataset_or_raise(db, dataset_id, with_fields=True, with_metadata_properties=True)
     await authorize(current_user, DatasetPolicyV1.search_records(dataset))
 
     await _validate_search_records_query(db, body, dataset_id)
@@ -589,7 +591,7 @@ async def search_current_user_dataset_records(
         sort_by_query_param=sort_by_query_param,
     )
 
-    record_id_score_map = {
+    record_id_score_map: Dict[UUID, Dict[str, Union[float, SearchRecord, None]]] = {
         response.record_id: {"query_score": response.score, "search_record": None}
         for response in search_responses.items
     }
@@ -603,6 +605,9 @@ async def search_current_user_dataset_records(
     )
 
     for record in records:
+        record.dataset = dataset
+        record.metadata_ = await _filter_record_metadata_for_user(record, current_user)
+
         record_id_score_map[record.id]["search_record"] = SearchRecord(
             record=RecordSchema.from_orm(record), query_score=record_id_score_map[record.id]["query_score"]
         )
@@ -698,3 +703,14 @@ async def list_dataset_records_search_suggestions_options(
             for sa in suggestion_agents_by_question
         ]
     )
+
+
+async def _filter_record_metadata_for_user(record: Record, user: User) -> Optional[Dict[str, Any]]:
+    if record.metadata_ is None:
+        return None
+
+    metadata = {}
+    for metadata_name in list(record.metadata_.keys()):
+        if await is_authorized(user, RecordPolicyV1.get_metadata(record, metadata_name)):
+            metadata[metadata_name] = record.metadata_[metadata_name]
+    return metadata