feat(server):jovu onboarding

Author: yuval-hazaz

ee/packages/git-sync-manager/src/models.ts

@@ -739,6 +739,11 @@ export enum EnumAssistantMessageRole {
   User = 'User'
 }
 
+export enum EnumAssistantMessageType {
+  Default = 'Default',
+  Onboarding = 'Onboarding'
+}
+
 export enum EnumAuthProviderType {
   Auth0 = 'Auth0',
   Http = 'Http',
@@ -2749,6 +2754,7 @@ export enum Role {
 
 export type SendAssistantMessageInput = {
   message: Scalars['String']['input'];
+  messageType?: InputMaybe<EnumAssistantMessageType>;
   threadId?: InputMaybe<Scalars['String']['input']>;
 };
 

libs/util/code-gen-types/src/models.ts

@@ -739,6 +739,11 @@ export enum EnumAssistantMessageRole {
   User = 'User'
 }
 
+export enum EnumAssistantMessageType {
+  Default = 'Default',
+  Onboarding = 'Onboarding'
+}
+
 export enum EnumAuthProviderType {
   Auth0 = 'Auth0',
   Http = 'Http',
@@ -2749,6 +2754,7 @@ export enum Role {
 
 export type SendAssistantMessageInput = {
   message: Scalars['String']['input'];
+  messageType?: InputMaybe<EnumAssistantMessageType>;
   threadId?: InputMaybe<Scalars['String']['input']>;
 };
 

packages/amplication-cli/src/models.ts

@@ -739,6 +739,11 @@ export enum EnumAssistantMessageRole {
   User = 'User'
 }
 
+export enum EnumAssistantMessageType {
+  Default = 'Default',
+  Onboarding = 'Onboarding'
+}
+
 export enum EnumAuthProviderType {
   Auth0 = 'Auth0',
   Http = 'Http',
@@ -2749,6 +2754,7 @@ export enum Role {
 
 export type SendAssistantMessageInput = {
   message: Scalars['String']['input'];
+  messageType?: InputMaybe<EnumAssistantMessageType>;
   threadId?: InputMaybe<Scalars['String']['input']>;
 };
 

packages/amplication-client/src/models.ts

@@ -742,6 +742,11 @@ export enum EnumAssistantMessageRole {
   User = 'User'
 }
 
+export enum EnumAssistantMessageType {
+  Default = 'Default',
+  Onboarding = 'Onboarding'
+}
+
 export enum EnumAuthProviderType {
   Auth0 = 'Auth0',
   Http = 'Http',
@@ -2752,6 +2757,7 @@ export enum Role {
 
 export type SendAssistantMessageInput = {
   message: Scalars['String']['input'];
+  messageType?: InputMaybe<EnumAssistantMessageType>;
   threadId?: InputMaybe<Scalars['String']['input']>;
 };
 

packages/amplication-server/src/core/assistant/assistant.resolver.ts

@@ -46,22 +46,8 @@ export class AssistantResolver {
     return this.service.processMessageWithStream(
       args.data.message,
       args.data.threadId,
-      args.context
+      args.context,
+      args.data.messageType
     );
   }
-
-  // @Mutation(() => AssistantThread)
-  // async sendAssistantMessage(
-  //   @UserEntity() user: User,
-  //   @Args() args: SendAssistantMessageArgs
-  // ): Promise<AssistantThread> {
-  //   args.context.user = user;
-  //   args.context.workspaceId = user.workspace.id;
-
-  //   return this.service.processMessage(
-  //     args.data.message,
-  //     args.data.threadId,
-  //     args.context
-  //   );
-  // }
 }

packages/amplication-server/src/core/assistant/assistant.service.ts

@@ -15,6 +15,7 @@ import { AssistantMessageDelta } from "./dto/AssistantMessageDelta";
 import { AssistantThread } from "./dto/AssistantThread";
 import { EnumAssistantFunctions } from "./dto/EnumAssistantFunctions";
 import { GraphqlSubscriptionPubSubKafkaService } from "./graphqlSubscriptionPubSubKafka.service";
+import { EnumAssistantMessageType } from "./dto/EnumAssistantMessageType";
 
 export const MESSAGE_UPDATED_EVENT = "assistantMessageUpdated";
 
@@ -23,6 +24,16 @@ export const PLUGIN_LATEST_VERSION_TAG = "latest";
 const STREAM_ERROR_MESSAGE =
   "It looks like we're experiencing a high demand right now, which might be affecting our connection to the AI model. Please give it a little time and try again later. We appreciate your patience and understanding as we work to resolve this. Thank you! 🙏";
 
+const ASSISTANT_INSTRUCTIONS: { [key in EnumAssistantMessageType]: string } = {
+  [EnumAssistantMessageType.Default]: ``,
+  [EnumAssistantMessageType.Onboarding]: `
+  The user is creating a new service and you need to generate everything needed for the service, including entities, fields, relations, apis, and install plugins. 
+  You can suggest names and different configuration as needed. 
+  After you create entities, also create fields and relations for all entities. Aim to create as many fields and relations as needed. 
+  Install any plugins that are needed for the service.
+  Your reply should start with "Welcome to Amplication!" and include a brief introduction to the service and the entities you created.`,
+};
+
 export type MessageLoggerContext = {
   messageContext: {
     workspaceId: string;
@@ -149,7 +160,8 @@ export class AssistantService {
   async processMessageWithStream(
     messageText: string,
     threadId: string,
-    context: AssistantContext
+    context: AssistantContext,
+    messageType?: EnumAssistantMessageType
   ): Promise<AssistantThread> {
     await this.validateAndReportUsage(context);
 
@@ -165,7 +177,10 @@ export class AssistantService {
       // eslint-disable-next-line @typescript-eslint/naming-convention
       assistant_id: this.assistantId,
       // eslint-disable-next-line @typescript-eslint/naming-convention
-      additional_instructions: `The following context is available: 
+      additional_instructions: `${
+        messageType && ASSISTANT_INSTRUCTIONS[messageType]
+      }. 
+      The following context is available: 
         ${JSON.stringify(preparedThread.shortContext)}`,
     });
 

packages/amplication-server/src/core/assistant/dto/EnumAssistantMessageType.ts

@@ -0,0 +1,10 @@
+import { registerEnumType } from "@nestjs/graphql";
+
+export enum EnumAssistantMessageType {
+  Default = "Default",
+  Onboarding = "Onboarding",
+}
+
+registerEnumType(EnumAssistantMessageType, {
+  name: "EnumAssistantMessageType",
+});

packages/amplication-server/src/core/assistant/dto/SendAssistantMessageInput.ts

@@ -1,4 +1,5 @@
 import { Field, InputType } from "@nestjs/graphql";
+import { EnumAssistantMessageType } from "./EnumAssistantMessageType";
 
 @InputType()
 export class SendAssistantMessageInput {
@@ -11,4 +12,9 @@ export class SendAssistantMessageInput {
     nullable: true,
   })
   threadId?: string;
+
+  @Field(() => EnumAssistantMessageType, {
+    nullable: true,
+  })
+  messageType?: EnumAssistantMessageType;
 }

packages/amplication-server/src/core/auth/auth.service.ts

@@ -532,12 +532,17 @@ export class AuthService {
     name: string,
     account: Account
   ): Promise<Workspace & { users: AuthUser[] }> {
-    const workspace = await this.workspaceService.createWorkspace(account.id, {
-      data: {
-        name,
+    const workspace = await this.workspaceService.createWorkspace(
+      account.id,
+      {
+        data: {
+          name,
+        },
+        include: WORKSPACE_INCLUDE,
       },
-      include: WORKSPACE_INCLUDE,
-    });
+      undefined,
+      true
+    );
 
     return workspace as unknown as Workspace & { users: AuthUser[] };
   }

packages/amplication-server/src/core/resource/resource.service.ts

@@ -596,12 +596,7 @@ export class ResourceService {
           authProvider: EnumAuthProviderType.Jwt, //@todo: remove this property
         },
 
-        gitRepository: {
-          isOverrideGitRepository: false,
-          name: "",
-          resourceId: "",
-          gitOrganizationId: "",
-        },
+        gitRepository: null,
       },
     };
 

packages/amplication-server/src/core/workspace/workspace.service.ts

@@ -189,7 +189,8 @@ export class WorkspaceService {
   async createWorkspace(
     accountId: string,
     args: Prisma.WorkspaceCreateArgs,
-    currentWorkspaceId?: string
+    currentWorkspaceId?: string,
+    connectToDemoRepo?: boolean
   ): Promise<Workspace> {
     if (await this.shouldBlockWorkspaceCreation(currentWorkspaceId)) {
       const message = "Your current plan does not allow creating workspaces";
@@ -226,7 +227,7 @@ export class WorkspaceService {
     await this.billingService.provisionCustomer(workspace.id);
 
     const [user] = workspace.users;
-    await this.projectService.createProject(
+    const newProject = await this.projectService.createProject(
       {
         data: {
           name: "Sample Project",
@@ -236,6 +237,10 @@ export class WorkspaceService {
       user.id
     );
 
+    if (connectToDemoRepo) {
+      await this.projectService.createDemoRepo(newProject.id);
+    }
+
     await this.billingService.reportUsage(
       workspace.id,
       BillingFeature.TeamMembers

packages/amplication-server/src/schema.graphql

@@ -703,6 +703,11 @@ enum EnumAssistantMessageRole {
   User
 }
 
+enum EnumAssistantMessageType {
+  Default
+  Onboarding
+}
+
 enum EnumAuthProviderType {
   Auth0
   Http
@@ -1942,6 +1947,7 @@ enum Role {
 
 input SendAssistantMessageInput {
   message: String!
+  messageType: EnumAssistantMessageType
   threadId: String
 }
 

packages/data-service-generator/src/models.ts

@@ -739,6 +739,11 @@ export enum EnumAssistantMessageRole {
   User = 'User'
 }
 
+export enum EnumAssistantMessageType {
+  Default = 'Default',
+  Onboarding = 'Onboarding'
+}
+
 export enum EnumAuthProviderType {
   Auth0 = 'Auth0',
   Http = 'Http',
@@ -2749,6 +2754,7 @@ export enum Role {
 
 export type SendAssistantMessageInput = {
   message: Scalars['String']['input'];
+  messageType?: InputMaybe<EnumAssistantMessageType>;
   threadId?: InputMaybe<Scalars['String']['input']>;
 };