[FEATURE] argilla: add support to distribution

argilla-frontend/components/features/datasets/dataset-progress/useDatasetProgressViewModel.ts

@@ -22,25 +22,11 @@ export const useDatasetProgressViewModel = ({
 
       progressRanges.value = [
         {
-          id: "submitted",
-          name: t("datasets.submitted"),
+          id: "completed",
+          name: t("datasets.completed"),
           color: "#0508D9",
-          value: progress.value.submitted,
-          tooltip: `${progress.value.submitted}/${progress.value.total}`,
-        },
-        {
-          id: "conflicting",
-          name: t("datasets.conflicting"),
-          color: "#8893c0",
-          value: progress.value.conflicting,
-          tooltip: `${progress.value.conflicting}/${progress.value.total}`,
-        },
-        {
-          id: "discarded",
-          name: t("datasets.discarded"),
-          color: "#b7b7b7",
-          value: progress.value.discarded,
-          tooltip: `${progress.value.discarded}/${progress.value.total}`,
+          value: progress.value.completed,
+          tooltip: `${progress.value.completed}/${progress.value.total}`,
         },
         {
           id: "pending",

argilla-frontend/translation/de.js

@@ -36,6 +36,11 @@ export default {
     datasetSettings: "einstellungen",
     userSettings: "meine einstellungen",
   },
+  datasets: {
+    left: "übrig",
+    completed: "Vollendet",
+    pending: "Ausstehend",
+  },
   recordStatus: {
     pending: "Ausstehend",
     draft: "Entwurf",

argilla-frontend/translation/en.js

@@ -42,9 +42,7 @@ export default {
   },
   datasets: {
     left: "left",
-    submitted: "Submitted",
-    conflicting: "Conflicting",
-    discarded: "Discarded",
+    completed: "Completed",
     pending: "Pending",
   },
   recordStatus: {

argilla-frontend/v1/domain/entities/dataset/Metrics.test.ts

@@ -20,67 +20,67 @@ describe("Metrics", () => {
 
   describe("total", () => {
     it("should return the total number of records", () => {
-      const metrics = new Metrics(1, 0, 0, 0, 0);
+      const metrics = new Metrics(15, 4, 5, 1, 5);
 
       const result = metrics.total;
 
-      expect(result).toEqual(1);
+      expect(result).toEqual(15);
     });
   });
 
   describe("responded", () => {
     it("should return the number of responded records", () => {
-      const metrics = new Metrics(5, 5, 3, 1, 1);
+      const metrics = new Metrics(15, 4, 5, 1, 5);
 
       const result = metrics.responded;
 
-      expect(result).toEqual(5);
+      expect(result).toEqual(10);
     });
   });
 
   describe("pending", () => {
     it("should return the number of pending records", () => {
-      const metrics = new Metrics(5, 4, 3, 1, 0);
+      const metrics = new Metrics(15, 4, 5, 1, 5);
 
       const result = metrics.pending;
 
-      expect(result).toEqual(1);
+      expect(result).toEqual(5);
     });
   });
 
   describe("progress", () => {
     it("should return the progress of responded records", () => {
-      const metrics = new Metrics(5, 4, 3, 1, 0);
+      const metrics = new Metrics(15, 4, 5, 1, 5);
 
       const result = metrics.progress;
 
-      expect(result).toEqual(0.8);
+      expect(result).toEqual(0.6666666666666666);
     });
   });
 
   describe("percentage", () => {
     it("should return the percentage of draft records", () => {
-      const metrics = new Metrics(5, 4, 3, 1, 1);
+      const metrics = new Metrics(15, 4, 5, 1, 5);
 
       const result = metrics.percentage.draft;
 
-      expect(result).toEqual(20);
+      expect(result).toEqual(6.666666666666667);
     });
 
     it("should return the percentage of submitted records", () => {
-      const metrics = new Metrics(5, 4, 3, 1, 1);
+      const metrics = new Metrics(15, 4, 5, 1, 5);
 
       const result = metrics.percentage.submitted;
 
-      expect(result).toEqual(60);
+      expect(result).toEqual(26.666666666666668);
     });
 
     it("should return the percentage of discarded records", () => {
-      const metrics = new Metrics(5, 4, 3, 1, 1);
+      const metrics = new Metrics(15, 4, 5, 1, 5);
 
       const result = metrics.percentage.discarded;
 
-      expect(result).toEqual(20);
+      expect(result).toEqual(33.333333333333336);
     });
   });
 });

argilla-frontend/v1/domain/entities/dataset/Metrics.ts

@@ -7,11 +7,11 @@ export class Metrics {
   };
 
   constructor(
-    private readonly records: number,
-    public readonly responses: number,
+    public readonly total: number,
     public readonly submitted: number,
     public readonly discarded: number,
-    public readonly draft: number
+    public readonly draft: number,
+    public readonly pending: number
   ) {
     this.percentage = {
       pending: (this.pending * 100) / this.total,
@@ -22,21 +22,13 @@ export class Metrics {
   }
 
   get hasMetrics() {
-    return this.records > 0;
-  }
-
-  get total() {
-    return this.records;
+    return this.total > 0;
   }
 
   get responded() {
     return this.submitted + this.discarded + this.draft;
   }
 
-  get pending() {
-    return this.total - this.responded;
-  }
-
   get progress() {
     return this.responded / this.total;
   }

argilla-frontend/v1/domain/entities/dataset/Progress.ts

@@ -1,9 +1,7 @@
 export class Progress {
   constructor(
     public readonly total: number,
-    public readonly submitted: number,
-    public readonly discarded: number,
-    public readonly conflicting: number,
+    public readonly completed: number,
     public readonly pending: number
   ) {}
 }

argilla-frontend/v1/infrastructure/repositories/DatasetRepository.ts

@@ -107,13 +107,7 @@ export class DatasetRepository implements IDatasetRepository {
         largeCache()
       );
 
-      return new Progress(
-        data.total,
-        data.submitted,
-        data.discarded,
-        data.conflicting,
-        data.pending
-      );
+      return new Progress(data.total, data.completed, data.pending);
     } catch (err) {
       throw {
         response: DATASET_API_ERRORS.ERROR_DELETING_DATASET,

argilla-frontend/v1/infrastructure/repositories/MetricsRepository.ts

@@ -3,14 +3,12 @@ import { largeCache } from "./AxiosCache";
 import { Metrics } from "~/v1/domain/entities/dataset/Metrics";
 
 interface BackendMetrics {
-  records: {
-    count: number;
-  };
   responses: {
-    count: number;
+    total: number;
     submitted: number;
     discarded: number;
     draft: number;
+    pending: number;
   };
 }
 
@@ -25,11 +23,11 @@ export class MetricsRepository {
       );
 
       return new Metrics(
-        data.records.count,
-        data.responses.count,
+        data.responses.total,
         data.responses.submitted,
         data.responses.discarded,
-        data.responses.draft
+        data.responses.draft,
+        data.responses.pending
       );
     } catch {
       /* lint:disable:no-empty */

argilla-frontend/v1/infrastructure/repositories/RecordRepository.ts

@@ -42,10 +42,7 @@ export class RecordRepository {
   constructor(private readonly axios: NuxtAxiosInstance) {}
 
   getRecords(criteria: RecordCriteria): Promise<BackendRecords> {
-    if (criteria.isFilteringByAdvanceSearch)
-      return this.getRecordsByAdvanceSearch(criteria);
-
-    return this.getRecordsByDatasetId(criteria);
+    return this.getRecordsByAdvanceSearch(criteria);
   }
 
   async getRecord(recordId: string): Promise<BackendRecord> {
@@ -188,35 +185,6 @@ export class RecordRepository {
     }
   }
 
-  private async getRecordsByDatasetId(
-    criteria: RecordCriteria
-  ): Promise<BackendRecords> {
-    const { datasetId, status, page } = criteria;
-    const { from, many } = page.server;
-    try {
-      const url = `/v1/me/datasets/${datasetId}/records`;
-
-      const params = this.createParams(from, many, status);
-
-      const { data } = await this.axios.get<ResponseWithTotal<BackendRecord[]>>(
-        url,
-        {
-          params,
-        }
-      );
-      const { items: records, total } = data;
-
-      return {
-        records,
-        total,
-      };
-    } catch (err) {
-      throw {
-        response: RECORD_API_ERRORS.ERROR_FETCHING_RECORDS,
-      };
-    }
-  }
-
   private async getRecordsByAdvanceSearch(
     criteria: RecordCriteria
   ): Promise<BackendRecords> {
@@ -264,6 +232,30 @@ export class RecordRepository {
         };
       }
 
+      body.filters = {
+        and: [
+          {
+            type: "terms",
+            scope: {
+              entity: "response",
+              property: "status",
+            },
+            values: [status],
+          },
+        ],
+      };
+
+      if (status === "pending") {
+        body.filters.and.push({
+          type: "terms",
+          scope: {
+            entity: "record",
+            property: "status",
+          },
+          values: ["pending"],
+        });
+      }
+
       if (
         isFilteringByMetadata ||
         isFilteringByResponse ||

argilla-frontend/v1/infrastructure/types/dataset.ts

@@ -16,8 +16,6 @@ export interface BackendDatasetFeedbackTaskResponse {
 
 export interface BackendProgress {
   total: number;
-  submitted: number;
-  discarded: number;
-  conflicting: number;
+  completed: number;
   pending: number;
 }

argilla-server/CHANGELOG.md

@@ -16,15 +16,22 @@ These are the section headers that we use:
 
 ## [Unreleased]()
 
-### Fixed
-
-- Fixed SQLite connection settings not working correctly due to a outdated conditional. ([#5149](https://github.com/argilla-io/argilla/pull/5149))
+### Added
 
-## [2.0.0rc1](https://github.com/argilla-io/argilla/compare/v1.29.0...v2.0.0rc1)
+- Added support to specify `distribution` attribute when creating a dataset. ([#5013](https://github.com/argilla-io/argilla/pull/5013))
+- Added support to change `distribution` attribute when updating a dataset. ([#5028](https://github.com/argilla-io/argilla/pull/5028))
 
 ### Changed
 
 - Change `responses` table to delete rows on cascade when a user is deleted. ([#5126](https://github.com/argilla-io/argilla/pull/5126))
+- [breaking] Change `GET /datasets/:dataset_id/progress` endpoint to support new dataset distribution task. ([#5140](https://github.com/argilla-io/argilla/pull/5140))
+- [breaking] Change `GET /me/datasets/:dataset_id/metrics` endpoint to support new dataset distribution task. ([#5140](https://github.com/argilla-io/argilla/pull/5140))
+
+### Fixed
+
+- Fixed SQLite connection settings not working correctly due to a outdated conditional. ([#5149](https://github.com/argilla-io/argilla/pull/5149))
+
+## [2.0.0rc1](https://github.com/argilla-io/argilla/compare/v1.29.0...v2.0.0rc1)
 
 ### Removed