Switch to name

autoblocksai · Sep 26, 2024 · bb46df2 · bb46df2
1 parent 1f7ae4f
commit bb46df2
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/src/client.ts b/src/client.ts
@@ -1,4 +1,8 @@
-import { DatasetId, DatasetItem, DatasetSchemaVersion } from './datasets';
+import type {
+  DatasetItem,
+  DatasetName,
+  DatasetSchemaVersion,
+} from './datasets';
 import type { HumanReviewFieldContentType, TimeDelta } from './types';
 import {
   convertTimeDeltaToMilliSeconds,
@@ -263,7 +267,7 @@ export class AutoblocksAPIClient {
   }
 
   public async getDataset<
-    T extends DatasetId,
+    T extends DatasetName,
     U extends DatasetSchemaVersion<T>,
   >(args: {
     name: T;

diff --git a/src/datasets-cli/index.ts b/src/datasets-cli/index.ts
@@ -30,7 +30,7 @@ export const autogenerationConfigs: AutogenerationConfig[] = [
       let generated = `interface ${args.symbolName} {`;
 
       args.datasets.forEach((dataset) => {
-        generated += `\n  '${dataset.id}': {`; // start of dataset definition
+        generated += `\n  '${dataset.name}': {`; // start of dataset definition
 
         generated += `\n    '${RevisionSpecialVersionsEnum.LATEST}': Record<string, unknown>;`;
 

diff --git a/src/datasets-cli/types.ts b/src/datasets-cli/types.ts
@@ -93,7 +93,7 @@ export const zDatasetSchema = z
 export type DatasetSchema = z.infer<typeof zDatasetSchema>;
 
 export interface ParsedDataset {
-  id: string;
+  name: string;
   schemaVersions: {
     schema: DatasetSchema;
     version: number;

diff --git a/src/datasets/autogenerated.ts b/src/datasets/autogenerated.ts
@@ -4,12 +4,12 @@
 // Map of dataset ID -> schema version
 interface __Autogenerated__DatasetsTypes {}
 
-export type __Autogenerated__DatasetId = keyof __Autogenerated__DatasetsTypes &
-  string;
+export type __Autogenerated__DatasetName =
+  keyof __Autogenerated__DatasetsTypes & string;
 export type __Autogenerated__DatasetSchemaVersion<
-  T extends __Autogenerated__DatasetId,
+  T extends __Autogenerated__DatasetName,
 > = keyof __Autogenerated__DatasetsTypes[T] & string;
 export type __Autogenerated__DatasetItem<
-  T extends __Autogenerated__DatasetId,
+  T extends __Autogenerated__DatasetName,
   U extends __Autogenerated__DatasetSchemaVersion<T>,
 > = __Autogenerated__DatasetsTypes[T][U];
diff --git a/src/datasets/index.ts b/src/datasets/index.ts
@@ -1,5 +1,5 @@
 export type {
-  __Autogenerated__DatasetId as DatasetId,
+  __Autogenerated__DatasetName as DatasetName,
   __Autogenerated__DatasetSchemaVersion as DatasetSchemaVersion,
   __Autogenerated__DatasetItem as DatasetItem,
 } from './autogenerated';
diff --git a/src/index.ts b/src/index.ts
@@ -11,4 +11,8 @@ export type {
   HumanReviewTestCaseStatus,
 } from './client';
 export type { TimeDelta, HumanReviewFieldContentType } from './types';
-export type { DatasetId, DatasetSchemaVersion, DatasetItem } from './datasets';
+export type {
+  DatasetName,
+  DatasetSchemaVersion,
+  DatasetItem,
+} from './datasets';
diff --git a/test/datasets-cli/index.spec.ts b/test/datasets-cli/index.spec.ts
@@ -9,7 +9,7 @@ describe('Datasets CLI', () => {
     it('should autogenerate types', () => {
       const datasets: ParsedDataset[] = [
         {
-          id: 'dataset-a',
+          name: 'dataset-a',
           schemaVersions: [
             {
               version: 1,
@@ -44,7 +44,7 @@ describe('Datasets CLI', () => {
           ],
         },
         {
-          id: 'dataset-b',
+          name: 'dataset-b',
           schemaVersions: [
             {
               version: 1,
@@ -78,7 +78,7 @@ describe('Datasets CLI', () => {
           ],
         },
         {
-          id: 'dataset-c',
+          name: 'dataset-c',
           schemaVersions: [],
         },
       ];