@promptbook/cli 0.103.0-47 → 0.103.0-48

package/apps/agents-server/src/database/schema.sql

@@ -0,0 +1,131 @@
+
+-- Note: This is primary source of truth for the database schema
+--       In future we want to be compatible with more then Supabase so we keep SQL as main schema definition
+--       To update, search for [💽]
+
+
+
+CREATE TABLE IF NOT EXISTS "EnvironmentVariable" (
+    "id" BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+    "key" TEXT NOT NULL,
+    "value" TEXT NOT NULL,
+    "note" TEXT NULL,
+    CONSTRAINT EnvironmentVariable_key_key UNIQUE ("key")
+);
+
+
+CREATE TABLE IF NOT EXISTS "Agent" (
+    "id" BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+    "agentName" TEXT NOT NULL,
+    
+
+    "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(),
+    "updatedAt" TIMESTAMP WITH TIME ZONE NULL DEFAULT NULL,
+
+
+    "agentHash" TEXT NOT NULL,
+    "agentSource" TEXT NOT NULL,
+    "agentProfile" JSONB NOT NULL,   
+    "promptbookEngineVersion" TEXT NOT NULL,
+   
+    "usage" JSONB NULL,
+    "preparedModelRequirements" JSONB NULL,
+    "preparedExternals" JSONB NULL
+);
+-- Ensure uniqueness of agentName even on repeated schema application without duplicate constraint creation
+CREATE UNIQUE INDEX IF NOT EXISTS agent_agentname_key ON "Agent" ("agentName");
+COMMENT ON COLUMN "Agent"."agentName" IS 'The unique name of the agent derived from the first line of the `agentSource`, automatically updated on `agentSource` change';
+COMMENT ON COLUMN "Agent"."agentHash" IS 'The hash of the `agentSource`, automatically updated on `agentSource` change';
+COMMENT ON COLUMN "Agent"."agentSource" IS 'The source code of the agent';
+COMMENT ON COLUMN "Agent"."agentProfile" IS 'The profile of the agent generated from the `agentSource`, automatically updated on `agentSource` change <- TODO: [🕛]';
+COMMENT ON COLUMN "Agent"."promptbookEngineVersion" IS 'The version of the Promptbook engine used for last update of the agent';
+COMMENT ON COLUMN "Agent"."usage" IS 'Usage and spending statistics for the agent';
+COMMENT ON COLUMN "Agent"."preparedModelRequirements" IS 'The prepared model requirements for the agent, generated from the `agentSource` but not after every change (only on explicit request), there is `agentHash` to identify the version of the `agentSource` this was prepared from';
+COMMENT ON COLUMN "Agent"."preparedExternals" IS 'The prepared externals for the agent, generated from the `agentSource` but not after every change (only on explicit request), there is `agentHash` to identify the version of the `agentSource` this was prepared from';
+
+
+CREATE TABLE IF NOT EXISTS "AgentHistory" (
+    "id" BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+    "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(),
+
+    "agentName" TEXT NOT NULL,
+    "agentHash" TEXT NOT NULL,
+    "previousAgentHash" TEXT NULL,
+    "agentSource" TEXT NOT NULL,
+    "promptbookEngineVersion" TEXT NOT NULL
+    
+);
+
+CREATE INDEX IF NOT EXISTS "AgentHistory_agentName_idx" ON "AgentHistory" ("agentName");
+CREATE INDEX IF NOT EXISTS "AgentHistory_agentHash_idx" ON "AgentHistory" ("agentHash");
+
+
+CREATE TABLE IF NOT EXISTS "ChatHistory" (
+    "id" BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+    "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(),
+
+    "messageHash" TEXT NOT NULL,
+    "previousMessageHash" TEXT NULL,
+    "agentName" TEXT NOT NULL,
+    "agentHash" TEXT NOT NULL,
+    "message" JSONB NOT NULL,
+
+    -- Telemetry:
+    "promptbookEngineVersion" TEXT NULL,
+    "url" TEXT NULL,
+    "ip" TEXT NULL,
+    "userAgent" TEXT NULL,
+    "language" TEXT NULL,
+    "platform" TEXT NULL
+);
+COMMENT ON COLUMN "ChatHistory"."url" IS 'The URL where the chat was happening';
+COMMENT ON COLUMN "ChatHistory"."ip" IS 'The IP address of the user';
+COMMENT ON COLUMN "ChatHistory"."userAgent" IS 'The user agent (browser) of the user';
+COMMENT ON COLUMN "ChatHistory"."language" IS 'The language (from the browser) of the user';
+COMMENT ON COLUMN "ChatHistory"."platform" IS 'The platform of the user';
+
+
+CREATE TABLE IF NOT EXISTS "ChatFeedback" (
+    "id" BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
+    "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(),
+
+    "agentName" TEXT NOT NULL,
+    "agentHash" TEXT NOT NULL,
+    "rating" TEXT NULL,
+    "textRating" TEXT NULL,
+    "chatThread" TEXT NULL,
+    "userNote" TEXT NULL,
+    "expectedAnswer" TEXT NULL,
+
+    -- Telemetry:
+    "promptbookEngineVersion" TEXT NULL,
+    "url" TEXT NULL,
+    "ip" TEXT NULL,
+    "userAgent" TEXT NULL,
+    "language" TEXT NULL,
+    "platform" TEXT NULL
+);
+COMMENT ON COLUMN "ChatFeedback"."url" IS 'The URL where the chat was happening';
+COMMENT ON COLUMN "ChatFeedback"."ip" IS 'The IP address of the user';
+COMMENT ON COLUMN "ChatFeedback"."userAgent" IS 'The user agent (browser) of the user';
+COMMENT ON COLUMN "ChatFeedback"."language" IS 'The language (from the browser) of the user';
+COMMENT ON COLUMN "ChatFeedback"."platform" IS 'The platform of the user';
+
+
+/*
+CREATE TABLE IF NOT EXISTS "AgentActionHistory" (
+id BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+createdAt TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(),
+
+);
+*/
+
+
+/*
+CREATE TABLE IF NOT EXISTS "Xxx" (
+id BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+);
+*/
+
+
+-- TODO: !!!! Create propper database migrations

package/apps/agents-server/src/database/schema.ts

@@ -0,0 +1,217 @@
+/**
+ * AUTO-GENERATED TYPES FROM `schema.sql`
+ * Source of truth: `schema.sql` *(do not edit table structure here manually)*
+ *
+ * [💽] Prompt:
+ * Re-generate supabase typescript schema from the `./schema.sql`
+ */
+
+// Json helper (Supabase style)
+export type Json = string | number | boolean | null | { [key: string]: Json | undefined } | Json[];
+
+// Public schema database interface (Supabase convention)
+export type AgentsServerDatabase = {
+    public: {
+        Tables: {
+            EnvironmentVariable: {
+                Row: {
+                    id: number;
+                    key: string;
+                    value: string;
+                    note: string | null;
+                };
+                Insert: {
+                    id?: number;
+                    key: string;
+                    value: string;
+                    note?: string | null;
+                };
+                Update: {
+                    id?: number;
+                    key?: string;
+                    value?: string;
+                    note?: string | null;
+                };
+                Relationships: [];
+            };
+            Agent: {
+                Row: {
+                    id: number;
+                    agentName: string;
+                    createdAt: string;
+                    updatedAt: string | null;
+                    agentHash: string;
+                    agentSource: string;
+                    agentProfile: Json;
+                    promptbookEngineVersion: string;
+                    usage: Json | null;
+                    preparedModelRequirements: Json | null;
+                    preparedExternals: Json | null;
+                };
+                Insert: {
+                    id?: number;
+                    agentName: string;
+                    createdAt: string;
+                    updatedAt?: string | null;
+                    agentHash: string;
+                    agentSource: string;
+                    agentProfile: Json;
+                    promptbookEngineVersion: string;
+                    usage?: Json | null;
+                    preparedModelRequirements?: Json | null;
+                    preparedExternals?: Json | null;
+                };
+                Update: {
+                    id?: number;
+                    agentName?: string;
+                    createdAt?: string;
+                    updatedAt?: string | null;
+                    agentHash?: string;
+                    agentSource?: string;
+                    agentProfile?: Json;
+                    promptbookEngineVersion?: string;
+                    usage?: Json | null;
+                    preparedModelRequirements?: Json | null;
+                    preparedExternals?: Json | null;
+                };
+                Relationships: [];
+            };
+            AgentHistory: {
+                Row: {
+                    id: number;
+                    createdAt: string;
+                    agentName: string;
+                    agentHash: string;
+                    previousAgentHash: string | null;
+                    agentSource: string;
+                    promptbookEngineVersion: string;
+                };
+                Insert: {
+                    id?: number;
+                    createdAt: string;
+                    agentName: string;
+                    agentHash: string;
+                    previousAgentHash?: string | null;
+                    agentSource: string;
+                    promptbookEngineVersion: string;
+                };
+                Update: {
+                    id?: number;
+                    createdAt?: string;
+                    agentName?: string;
+                    agentHash?: string;
+                    previousAgentHash?: string | null;
+                    agentSource?: string;
+                    promptbookEngineVersion?: string;
+                };
+                Relationships: [];
+            };
+            ChatHistory: {
+                Row: {
+                    id: number;
+                    createdAt: string;
+                    messageHash: string;
+                    previousMessageHash: string | null;
+                    agentName: string;
+                    agentHash: string;
+                    message: Json;
+                    promptbookEngineVersion: string | null;
+                    url: string | null;
+                    ip: string | null;
+                    userAgent: string | null;
+                    language: string | null;
+                    platform: string | null;
+                };
+                Insert: {
+                    id?: number;
+                    createdAt: string;
+                    messageHash: string;
+                    previousMessageHash?: string | null;
+                    agentName: string;
+                    agentHash: string;
+                    message: Json;
+                    promptbookEngineVersion?: string | null;
+                    url?: string | null;
+                    ip?: string | null;
+                    userAgent?: string | null;
+                    language?: string | null;
+                    platform?: string | null;
+                };
+                Update: {
+                    id?: number;
+                    createdAt?: string;
+                    messageHash?: string;
+                    previousMessageHash?: string | null;
+                    agentName?: string;
+                    agentHash?: string;
+                    message?: Json;
+                    promptbookEngineVersion?: string | null;
+                    url?: string | null;
+                    ip?: string | null;
+                    userAgent?: string | null;
+                    language?: string | null;
+                    platform?: string | null;
+                };
+                Relationships: [];
+            };
+            ChatFeedback: {
+                Row: {
+                    id: number;
+                    createdAt: string;
+                    agentName: string;
+                    agentHash: string;
+                    rating: string | null;
+                    textRating: string | null;
+                    chatThread: string | null;
+                    userNote: string | null;
+                    expectedAnswer: string | null;
+                    promptbookEngineVersion: string | null;
+                    url: string | null;
+                    ip: string | null;
+                    userAgent: string | null;
+                    language: string | null;
+                    platform: string | null;
+                };
+                Insert: {
+                    id?: number;
+                    createdAt: string;
+                    agentName: string;
+                    agentHash: string;
+                    rating?: string | null;
+                    textRating?: string | null;
+                    chatThread?: string | null;
+                    userNote?: string | null;
+                    expectedAnswer?: string | null;
+                    promptbookEngineVersion?: string | null;
+                    url?: string | null;
+                    ip?: string | null;
+                    userAgent?: string | null;
+                    language?: string | null;
+                    platform?: string | null;
+                };
+                Update: {
+                    id?: number;
+                    createdAt?: string;
+                    agentName?: string;
+                    agentHash?: string;
+                    rating?: string | null;
+                    textRating?: string | null;
+                    chatThread?: string | null;
+                    userNote?: string | null;
+                    expectedAnswer?: string | null;
+                    promptbookEngineVersion?: string | null;
+                    url?: string | null;
+                    ip?: string | null;
+                    userAgent?: string | null;
+                    language?: string | null;
+                    platform?: string | null;
+                };
+                Relationships: [];
+            };
+        };
+        Views: Record<string, never>;
+        Functions: Record<string, never>;
+        Enums: Record<string, never>;
+        CompositeTypes: Record<string, never>;
+    };
+};

package/apps/agents-server/src/tools/$provideAgentCollectionForServer.ts

@@ -2,11 +2,11 @@
 
 import { AgentCollectionInSupabase } from '@promptbook-local/core';
 import { AgentCollection } from '@promptbook-local/types';
-import { getSupabaseForServer } from '../supabase/getSupabaseForServer';
+import { $provideSupabaseForServer } from '../database/$provideSupabaseForServer';
 
 /**
  * Cache of provided agent collection
- * 
+ *
  * @private internal cache for `$provideAgentCollectionForServer`
  */
 let agentCollection: null | AgentCollection = null;
@@ -40,7 +40,7 @@ export async function $provideAgentCollectionForServer(): Promise<AgentCollectio
     });
     */
 
-    const supabase = getSupabaseForServer();
+    const supabase = $provideSupabaseForServer();
 
     agentCollection = new AgentCollectionInSupabase(supabase, {
         isVerbose,

package/apps/agents-server/src/tools/$provideOpenAiAssistantExecutionToolsForServer.ts

@@ -26,7 +26,7 @@ export async function $provideOpenAiAssistantExecutionToolsForServer(): Promise<
 
     executionTools = new OpenAiAssistantExecutionTools({
         apiKey: process.env.OPENAI_API_KEY,
-        assistantId: '!!!! null',
+        assistantId: 'abstract_assistant', // <- TODO: !!!! In `OpenAiAssistantExecutionTools` Allow to create abstract assistants with `isCreatingNewAssistantsAllowed`
         isCreatingNewAssistantsAllowed: true,
         isVerbose,
     });

package/apps/agents-server/src/utils/cdn/utils/getUserFileCdnKey.ts

@@ -1,7 +1,7 @@
-import { titleToName } from '../../../../../../src/utils/normalization/titleToName';
 import hexEncoder from 'crypto-js/enc-hex';
 import sha256 from 'crypto-js/sha256';
 import type { string_uri } from '../../../../../../src/types/typeAliases';
+import { titleToName } from '../../../../../../src/utils/normalization/titleToName';
 import { nameToSubfolderPath } from './nameToSubfolderPath';
 
 /**
@@ -9,6 +9,7 @@ import { nameToSubfolderPath } from './nameToSubfolderPath';
  */
 export function getUserFileCdnKey(file: Buffer, originalFilename: string): string_uri {
     const hash = sha256(hexEncoder.parse(file.toString('hex'))).toString(/* hex */);
+    //    <- TODO: [🥬] Encapsulate sha256 to some private utility function
 
     const originalFilenameParts = originalFilename.split('.');
     const extension = originalFilenameParts.pop();