@liquidmetal-ai/drizzle 0.1.3 → 0.2.2

package/src/appify/validate.ts

@@ -10,6 +10,9 @@ import {
   Queue,
   Service,
   SqlDatabase,
+  Task,
+  TASK_TYPES,
+  TaskType,
   valueOf,
   VectorIndex,
   VISIBILITIES,
@@ -32,6 +35,7 @@ export type Validator = {
   onService?: On<Service>;
   onActor?: On<Actor>;
   onObserver?: On<Observer>;
+  onTask?: On<Task>;
   onBucket?: On<Bucket>;
   onQueue?: On<Queue>;
   onEnv?: On<Env>;
@@ -61,6 +65,7 @@ export async function validate(apps: Application[], validators: Validator[]): Pr
       await validateServices(app, validator, errors);
       await validateActors(app, validator, errors);
       await validateObservers(app, validator, errors);
+      await validateTasks(app, validator, errors);
       await validateBuckets(app, validator, errors);
       await validateQueues(app, validator, errors);
       await validateEnvs(app, app, validator, errors);
@@ -96,6 +101,14 @@ async function validateObservers(app: Application, validator: Validator, errors:
   }
 }
 
+async function validateTasks(app: Application, validator: Validator, errors: ValidationError[]): Promise<void> {
+  for (const task of app.task) {
+    await validateHelper(validator.onTask, app, task, errors);
+    await validateBindings(app, task, validator, errors);
+    await validateEnvs(app, task, validator, errors);
+  }
+}
+
 async function validateBuckets(app: Application, validator: Validator, errors: ValidationError[]): Promise<void> {
   for (const bucket of app.bucket) {
     await validateHelper(validator.onBucket, app, bucket, errors);
@@ -338,6 +351,47 @@ const observerSourceValidator: Validator = {
   },
 };
 
+const taskValidator: Validator = {
+  onTask: async (app: Application, task: Task): Promise<ValidationError[]> => {
+    const errors: ValidationError[] = [];
+    if (task.type === undefined) {
+      errors.push({
+        message: 'task must have a type',
+        severity: 'error',
+        ...task.obj,
+      });
+      return errors;
+    }
+    if (TASK_TYPES.indexOf(valueOf(task.type) as TaskType) === -1) {
+      errors.push({
+        message: `task type must be one of: ${TASK_TYPES.join(', ')}`,
+        severity: 'error',
+        ...task.obj,
+      });
+      return errors;
+    }
+    if (valueOf(task.type) === 'cron') {
+      if (task.cron === undefined) {
+        errors.push({
+          message: 'cron task must have a cron attribute',
+          severity: 'error',
+          ...task.obj,
+        });
+      } else if (!VALID_CRON_PATTERN.test(valueOf(task.cron))) {
+        errors.push({
+          message: `task cron expression is malformed: ${valueOf(task.cron)}`,
+          severity: 'error',
+          ...task.obj,
+        });
+      }
+    }
+    return errors;
+  },
+};
+
+const VALID_CRON_PATTERN =
+  /(@(annually|yearly|monthly|weekly|daily|hourly|reboot))|(@every (\d+(ns|us|µs|ms|s|m|h))+)|((((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|\*) ?){5,7})/;
+
 async function visibilityValidatorFn(app: Application, obj: { visibility?: TokenString }): Promise<ValidationError[]> {
   const errors: ValidationError[] = [];
   if (obj.visibility && !(VISIBILITIES as readonly string[]).includes(valueOf(obj.visibility))) {
@@ -353,6 +407,7 @@ async function visibilityValidatorFn(app: Application, obj: { visibility?: Token
 const visibilityValidator: Validator = {
   onService: visibilityValidatorFn,
   onActor: visibilityValidatorFn,
+  onTask: visibilityValidatorFn,
   onQueue: visibilityValidatorFn,
   onBucket: visibilityValidatorFn,
 };
@@ -397,7 +452,7 @@ const vectorIndexValidator: Validator = {
     const errors: ValidationError[] = [];
     if (vectorIndex.dimensions === undefined) {
       errors.push({
-        message: 'vector index must have a dimension',
+        message: 'vector index must have a dimensions',
         severity: 'error',
         ...vectorIndex.obj,
       });
@@ -466,14 +521,36 @@ const duplicateModuleValidator: Validator = {
   },
 };
 
+const locationHintValidator: Validator = {
+  onBucket: async (app: Application, bucket: Bucket): Promise<ValidationError[]> => {
+    const locations = ['wnam', 'enam', 'weur', 'eeur', 'apac', 'oc'];
+    const errors: ValidationError[] = [];
+    // Default value is enam.
+    if (bucket.locationHint === undefined) {
+      return errors;
+    }
+    // Check if the value is valid.
+    if (!locations.includes(valueOf(bucket.locationHint))) {
+      errors.push({
+        message: `location_hint must be one of ${locations.join(', ')}`,
+        severity: 'error',
+        ...bucket.locationHint,
+      });
+    }
+    return errors;
+  },
+};
+
 export const VALIDATORS: Validator[] = [
   bindingNameValidator,
   bindingValueValidator,
   domainValidator,
   envValidator,
   observerSourceValidator,
+  taskValidator,
   visibilityValidator,
   nameValidator,
   vectorIndexValidator,
   duplicateModuleValidator,
+  locationHintValidator,
 ];

package/src/codestore.ts

@@ -112,7 +112,7 @@ export async function archive(bundle: ReadableBundle): Promise<ArrayBuffer> {
   for await (const file of bundle) {
     zip.file(file.name, await file.read());
   }
-  return await zip.generateAsync({ type: 'arraybuffer' });
+  return await zip.generateAsync({ type: 'uint8array' });
 }
 
 /**
@@ -126,7 +126,7 @@ export async function unarchive(zipBuffer: ArrayBuffer, bundle: WritableBundle):
     if (file.dir) {
       continue;
     }
-    const content = await file.async('arraybuffer');
+    const content = await file.async('uint8array');
     await bundle.write(file.name, Buffer.from(content));
   }
 }

package/src/liquidmetal/v1alpha1/catalog_connect.ts

@@ -3,7 +3,7 @@
 /* eslint-disable */
 // @ts-nocheck
 
-import { ApplicationsRequest, ApplicationsResponse, BootstrapRequest, BootstrapResponse, CreateApplicationsRequest, CreateApplicationsResponse, CreateVersionRequest, CreateVersionResponse, DeleteApplicationsRequest, DeleteApplicationsResponse, GetEnvRequest, GetEnvResponse, QueryResourcesRequest, QueryResourcesResponse, SetApplicationActiveStatesRequest, SetApplicationActiveStatesResponse, SetApplicationManifestsRequest, SetApplicationManifestsResponse, SetEnvRequest, SetEnvResponse, SetVersionSandboxStatesRequest, SetVersionSandboxStatesResponse, StatBundleRequest, StatBundleResponse, UploadBundleRequest, UploadBundleResponse, VersionsRequest, VersionsResponse } from "./catalog_pb.js";
+import { ApplicationsRequest, ApplicationsResponse, BootstrapRequest, BootstrapResponse, DeleteRequest, DeleteResponse, DeployRequest, DeployResponse, GetEnvsRequest, GetEnvsResponse, QueryResourcesRequest, QueryResourcesResponse, ReleaseRequest, ReleaseResponse, SetActiveRequest, SetActiveResponse, SetEnvsRequest, SetEnvsResponse, SetSandboxRequest, SetSandboxResponse, StatusRequest, StatusResponse, UploadBundleRequest, UploadBundleResponse, WatchRequest, WatchResponse } from "./catalog_pb.js";
 import { MethodKind } from "@bufbuild/protobuf";
 
 /**
@@ -23,6 +23,17 @@ import { MethodKind } from "@bufbuild/protobuf";
 export const CatalogService = {
   typeName: "liquidmetal.v1alpha1.CatalogService",
   methods: {
+    /**
+     * QueryResources returns the physical underlying resources for a given query
+     *
+     * @generated from rpc liquidmetal.v1alpha1.CatalogService.QueryResources
+     */
+    queryResources: {
+      name: "QueryResources",
+      I: QueryResourcesRequest,
+      O: QueryResourcesResponse,
+      kind: MethodKind.Unary,
+    },
     /**
      * Bootstrap is a special RPC that is used to bootstrap the system
      * using a one-time token.
@@ -35,33 +46,6 @@ export const CatalogService = {
       O: BootstrapResponse,
       kind: MethodKind.Unary,
     },
-    /**
-     * @generated from rpc liquidmetal.v1alpha1.CatalogService.Versions
-     */
-    versions: {
-      name: "Versions",
-      I: VersionsRequest,
-      O: VersionsResponse,
-      kind: MethodKind.Unary,
-    },
-    /**
-     * @generated from rpc liquidmetal.v1alpha1.CatalogService.CreateVersion
-     */
-    createVersion: {
-      name: "CreateVersion",
-      I: CreateVersionRequest,
-      O: CreateVersionResponse,
-      kind: MethodKind.Unary,
-    },
-    /**
-     * @generated from rpc liquidmetal.v1alpha1.CatalogService.SetVersionSandboxStates
-     */
-    setVersionSandboxStates: {
-      name: "SetVersionSandboxStates",
-      I: SetVersionSandboxStatesRequest,
-      O: SetVersionSandboxStatesResponse,
-      kind: MethodKind.Unary,
-    },
     /**
      * Applications fetches a list of applications for an organization.
      * This list follows best practices for pagination.
@@ -76,94 +60,113 @@ export const CatalogService = {
       kind: MethodKind.Unary,
     },
     /**
-     * @generated from rpc liquidmetal.v1alpha1.CatalogService.CreateApplications
+     * Deploy creates a new version, or branch, or amends in place.
+     *
+     * @generated from rpc liquidmetal.v1alpha1.CatalogService.Deploy
      */
-    createApplications: {
-      name: "CreateApplications",
-      I: CreateApplicationsRequest,
-      O: CreateApplicationsResponse,
+    deploy: {
+      name: "Deploy",
+      I: DeployRequest,
+      O: DeployResponse,
       kind: MethodKind.Unary,
     },
     /**
-     * @generated from rpc liquidmetal.v1alpha1.CatalogService.SetApplicationActiveStates
+     * UploadBundle uploads a bundle for a specific application version.
+     *
+     * @generated from rpc liquidmetal.v1alpha1.CatalogService.UploadBundle
      */
-    setApplicationActiveStates: {
-      name: "SetApplicationActiveStates",
-      I: SetApplicationActiveStatesRequest,
-      O: SetApplicationActiveStatesResponse,
+    uploadBundle: {
+      name: "UploadBundle",
+      I: UploadBundleRequest,
+      O: UploadBundleResponse,
       kind: MethodKind.Unary,
     },
     /**
-     * @generated from rpc liquidmetal.v1alpha1.CatalogService.DeleteApplications
+     * SetEnvs sets multiple environment variables for an application/version.
+     *
+     * @generated from rpc liquidmetal.v1alpha1.CatalogService.SetEnvs
      */
-    deleteApplications: {
-      name: "DeleteApplications",
-      I: DeleteApplicationsRequest,
-      O: DeleteApplicationsResponse,
+    setEnvs: {
+      name: "SetEnvs",
+      I: SetEnvsRequest,
+      O: SetEnvsResponse,
       kind: MethodKind.Unary,
     },
     /**
-     * @generated from rpc liquidmetal.v1alpha1.CatalogService.SetApplicationManifests
+     * GetEnvs gets multiple environment variables for an application/version.
+     *
+     * @generated from rpc liquidmetal.v1alpha1.CatalogService.GetEnvs
      */
-    setApplicationManifests: {
-      name: "SetApplicationManifests",
-      I: SetApplicationManifestsRequest,
-      O: SetApplicationManifestsResponse,
+    getEnvs: {
+      name: "GetEnvs",
+      I: GetEnvsRequest,
+      O: GetEnvsResponse,
       kind: MethodKind.Unary,
     },
     /**
-     * UploadBundle uploads a bundle for a specific application version.
+     * Release allows a deployed application to converge.
      *
-     * @generated from rpc liquidmetal.v1alpha1.CatalogService.UploadBundle
+     * @generated from rpc liquidmetal.v1alpha1.CatalogService.Release
      */
-    uploadBundle: {
-      name: "UploadBundle",
-      I: UploadBundleRequest,
-      O: UploadBundleResponse,
+    release: {
+      name: "Release",
+      I: ReleaseRequest,
+      O: ReleaseResponse,
       kind: MethodKind.Unary,
     },
     /**
-     * StatBundle returns the metadata for a bundle.
+     * Watch attaches a watcher to the ring buffer associated with an application.
+     *
+     * @generated from rpc liquidmetal.v1alpha1.CatalogService.Watch
+     */
+    watch: {
+      name: "Watch",
+      I: WatchRequest,
+      O: WatchResponse,
+      kind: MethodKind.ServerStreaming,
+    },
+    /**
+     * Delete sets an application to deleting.
      *
-     * @generated from rpc liquidmetal.v1alpha1.CatalogService.StatBundle
+     * @generated from rpc liquidmetal.v1alpha1.CatalogService.Delete
      */
-    statBundle: {
-      name: "StatBundle",
-      I: StatBundleRequest,
-      O: StatBundleResponse,
+    delete: {
+      name: "Delete",
+      I: DeleteRequest,
+      O: DeleteResponse,
       kind: MethodKind.Unary,
     },
     /**
-     * SetEnv sets an environment variable for an application/version.
+     * setActive sets application active/inactive (start/stop) state.
      *
-     * @generated from rpc liquidmetal.v1alpha1.CatalogService.SetEnv
+     * @generated from rpc liquidmetal.v1alpha1.CatalogService.SetActive
      */
-    setEnv: {
-      name: "SetEnv",
-      I: SetEnvRequest,
-      O: SetEnvResponse,
+    setActive: {
+      name: "SetActive",
+      I: SetActiveRequest,
+      O: SetActiveResponse,
       kind: MethodKind.Unary,
     },
     /**
-     * GetEnv gets an environment variable for an application/version.
+     * setSandbox sets application sandboxed/unsandboxed state.
      *
-     * @generated from rpc liquidmetal.v1alpha1.CatalogService.GetEnv
+     * @generated from rpc liquidmetal.v1alpha1.CatalogService.SetSandbox
      */
-    getEnv: {
-      name: "GetEnv",
-      I: GetEnvRequest,
-      O: GetEnvResponse,
+    setSandbox: {
+      name: "SetSandbox",
+      I: SetSandboxRequest,
+      O: SetSandboxResponse,
       kind: MethodKind.Unary,
     },
     /**
-     * QueryResources returns the physical underlying resources for a given query
+     * Status returns the status of an application@version.
      *
-     * @generated from rpc liquidmetal.v1alpha1.CatalogService.QueryResources
+     * @generated from rpc liquidmetal.v1alpha1.CatalogService.Status
      */
-    queryResources: {
-      name: "QueryResources",
-      I: QueryResourcesRequest,
-      O: QueryResourcesResponse,
+    status: {
+      name: "Status",
+      I: StatusRequest,
+      O: StatusResponse,
       kind: MethodKind.Unary,
     },
   }