Merge branch 'feat/openai' of github.com:codex-team/hawk.api.nodejs into stage

slaveeks · slaveeks · commit 28d26ee6c7f0 · 2025-11-09T05:29:59.000+03:00
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16.16.0
+v22.12.0
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM node:16-alpine as builder
+FROM node:22-alpine as builder
 
 WORKDIR /usr/src/app
 RUN apk add --no-cache git gcc g++ python3 make musl-dev
@@ -7,7 +7,7 @@ COPY package.json yarn.lock ./
 
 RUN yarn install
 
-FROM node:16-alpine
+FROM node:22-alpine
 
 WORKDIR /usr/src/app
 
diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod
@@ -1,4 +1,4 @@
-FROM node:16-alpine as builder
+FROM node:22-alpine as builder
 
 WORKDIR /usr/src/app
 RUN apk add --no-cache git gcc g++ python3 make musl-dev
@@ -11,7 +11,7 @@ COPY . .
 
 RUN yarn build
 
-FROM node:16-alpine
+FROM node:22-alpine
 
 WORKDIR /usr/src/app
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.2.20",
+  "version": "1.2.23",
   "main": "index.ts",
   "license": "BUSL-1.1",
   "scripts": {
@@ -33,6 +33,7 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
+    "@ai-sdk/openai": "^2.0.64",
     "@amplitude/node": "^1.10.0",
     "@graphql-tools/merge": "^8.3.1",
     "@graphql-tools/schema": "^8.5.1",
@@ -52,9 +53,9 @@
     "@types/mongodb": "^3.6.20",
     "@types/morgan": "^1.9.10",
     "@types/node": "^16.11.46",
-    "@types/node-fetch": "^2.5.4",
     "@types/safe-regex": "^1.1.6",
     "@types/uuid": "^8.3.4",
+    "ai": "^5.0.89",
     "amqp-connection-manager": "^3.1.0",
     "amqplib": "^0.5.5",
     "apollo-server-express": "^3.10.0",
@@ -85,6 +86,7 @@
     "redis": "^4.7.0",
     "safe-regex": "^2.1.0",
     "ts-node-dev": "^2.0.0",
-    "uuid": "^8.3.2"
+    "uuid": "^8.3.2",
+    "zod": "^3.25.76"
   }
 }
diff --git a/src/billing/cloudpayments.ts b/src/billing/cloudpayments.ts
@@ -202,7 +202,7 @@ export default class CloudPaymentsWebhooks {
       return;
     }
 
-    telegram.sendMessage(`✅ [Billing / Check] All checks passed successfully «${workspace.name}»`, TelegramBotURLs.Money)
+    telegram.sendMessage(`🤗 [Billing / Check] All checks passed successfully «${workspace.name}»`, TelegramBotURLs.Money)
       .catch(e => console.error('Error while sending message to Telegram: ' + e));
 
     HawkCatcher.send(new Error('[Billing / Check] All checks passed successfully'), body as any);
diff --git a/src/integrations/vercel-ai/index.ts b/src/integrations/vercel-ai/index.ts
@@ -0,0 +1,41 @@
+import { EventAddons, EventData } from '@hawk.so/types';
+import { generateText } from 'ai';
+import { openai } from '@ai-sdk/openai';
+import { eventSolvingInput } from './inputs/eventSolving';
+import { ctoInstruction } from './instructions/cto';
+
+/**
+ * Interface for interacting with Vercel AI Gateway
+ */
+class VercelAIApi {
+    /**
+     * Model ID to use for generating suggestions
+     */
+    private readonly modelId: string;
+
+    constructor() {
+      /**
+       * @todo make it dynamic, get from project settings
+       */
+      this.modelId = 'gpt-4o';
+    }
+
+    /**
+     * Generate AI suggestion for the event
+     *
+     * @param {EventData<EventAddons>} payload - event data
+     * @returns {Promise<string>} AI suggestion for the event
+     * @todo add defence against invalid prompt injection
+     */
+    public async generateSuggestion(payload: EventData<EventAddons>) {
+      const { text } = await generateText({
+        model: openai(this.modelId),
+        system: ctoInstruction,
+        prompt: eventSolvingInput(payload),
+      });
+
+      return text;
+    }
+}
+
+export const vercelAIApi = new VercelAIApi();
diff --git a/src/integrations/vercel-ai/inputs/eventSolving.ts b/src/integrations/vercel-ai/inputs/eventSolving.ts
@@ -0,0 +1,5 @@
+import { EventData, EventAddons } from '@hawk.so/types';
+
+export const eventSolvingInput = (payload: EventData<EventAddons>) => `
+Payload: ${JSON.stringify(payload)}
+`;
diff --git a/src/integrations/vercel-ai/instructions/cto.ts b/src/integrations/vercel-ai/instructions/cto.ts
@@ -0,0 +1,9 @@
+export const ctoInstruction = `Ты технический директор ИТ компании, тебе нужно пояснить ошибку и предложить решение.
+
+Предоставь ответ в следующем формате:
+
+1. Описание проблемы
+2. Решение проблемы
+3. Описание того, как можно предотвратить подобную ошибку в будущем
+
+Ответь на русском языке.`;
diff --git a/src/models/eventsFactory.js b/src/models/eventsFactory.js
@@ -688,7 +688,7 @@ class EventsFactory extends Factory {
     /**
      * If originalEventId equals repetitionId than user wants to get first repetition which is original event
      */
-    if (repetitionId === originalEventId) {
+    if (repetitionId.toString() === originalEventId.toString()) {
       const originalEvent = await this.eventsDataLoader.load(originalEventId);
 
       /**
diff --git a/src/resolvers/billingNew.ts b/src/resolvers/billingNew.ts
@@ -156,7 +156,7 @@ export default {
        * Send info to Telegram (non-blocking)
        */
       telegram
-        .sendMessage(`✅ [Billing / Compose payment]
+        .sendMessage(`👀 [Billing / Compose payment]
 
 card link operation: ${isCardLinkOperation}
 amount: ${+plan.monthlyCharge} RUB
diff --git a/src/resolvers/event.js b/src/resolvers/event.js
@@ -1,5 +1,6 @@
 const getEventsFactory = require('./helpers/eventsFactory').default;
 const sendPersonalNotification = require('../utils/personalNotifications').default;
+const { aiService } = require('../services/ai');
 
 /**
  * See all types and fields here {@see ../typeDefs/event.graphql}
@@ -89,6 +90,20 @@ module.exports = {
       return factory.getEventDailyChart(groupHash, days, timezoneOffset);
     },
 
+    /**
+     * Return AI suggestion for the event
+     *
+     * @param {string} projectId - event's project
+     * @param {string} eventId - event id
+     * @param {string} originalEventId - original event id
+     * @returns {Promise<string>} AI suggestion for the event
+     */
+    async aiSuggestion({ projectId, _id: eventId, originalEventId }, _args, context) {
+      const factory = getEventsFactory(context, projectId);
+
+      return aiService.generateSuggestion(factory, eventId, originalEventId);
+    },
+
     /**
      * Return release data for the event
      *
diff --git a/src/resolvers/project.js b/src/resolvers/project.js
@@ -14,6 +14,7 @@ const EVENTS_GROUP_HASH_INDEX_NAME = 'groupHashUnique';
 const REPETITIONS_GROUP_HASH_INDEX_NAME = 'groupHash_hashed';
 const REPETITIONS_USER_ID_INDEX_NAME = 'userId';
 const EVENTS_TIMESTAMP_INDEX_NAME = 'timestamp';
+const EVENTS_PAYLOAD_RELEASE_INDEX_NAME = 'payloadRelease';
 const GROUPING_TIMESTAMP_INDEX_NAME = 'groupingTimestamp';
 const GROUPING_TIMESTAMP_AND_LAST_REPETITION_TIME_AND_ID_INDEX_NAME = 'groupingTimestampAndLastRepetitionTimeAndId';
 const GROUPING_TIMESTAMP_AND_GROUP_HASH_INDEX_NAME = 'groupingTimestampAndGroupHash';
@@ -127,6 +128,15 @@ module.exports = {
         name: GROUPING_TIMESTAMP_AND_LAST_REPETITION_TIME_AND_ID_INDEX_NAME,
       });
 
+      await projectEventsCollection.createIndex({
+        'payload.release': 1,
+      },
+      {
+        name: EVENTS_PAYLOAD_RELEASE_INDEX_NAME,
+        background: true,
+        sparse: true,
+      });
+
       await projectEventsCollection.createIndex({
         groupHash: 1,
       },
@@ -503,14 +513,7 @@ module.exports = {
         { $match: { projectId: project._id.toString() } },
         {
           $project: {
-            release: {
-              $convert: {
-                input: '$release',
-                to: 'string',
-                onError: '',
-                onNull: '',
-              },
-            },
+            release: '$release',
             commitsCount: { $size: { $ifNull: ['$commits', [] ] } },
             filesCount: { $size: { $ifNull: ['$files', [] ] } },
             _releaseIdSec: { $floor: { $divide: [ { $toLong: { $toDate: '$_id' } }, 1000] } },
@@ -524,14 +527,7 @@ module.exports = {
               {
                 $match: {
                   $expr: {
-                    $eq: [ {
-                      $convert: {
-                        input: '$payload.release',
-                        to: 'string',
-                        onError: '',
-                        onNull: '',
-                      },
-                    }, '$$rel'],
+                    $eq: ['$payload.release', '$$rel'],
                   },
                 },
               },
diff --git a/src/services/ai.ts b/src/services/ai.ts
@@ -0,0 +1,27 @@
+import { vercelAIApi } from '../integrations/vercel-ai/';
+import { EventsFactoryInterface } from './types';
+
+/**
+ * Service for interacting with AI
+ */
+export class AIService {
+  /**
+   * Generate suggestion for the event
+   *
+   * @param eventsFactory - events factory
+   * @param eventId - event id
+   * @param originalEventId - original event id
+   * @returns {Promise<string>} - suggestion
+   */
+  public async generateSuggestion(eventsFactory: EventsFactoryInterface, eventId: string, originalEventId: string): Promise<string> {
+    const event = await eventsFactory.getEventRepetition(eventId, originalEventId);
+
+    if (!event) {
+      throw new Error('Event not found');
+    }
+
+    return vercelAIApi.generateSuggestion(event.payload);
+  }
+}
+
+export const aiService = new AIService();
diff --git a/src/services/types.ts b/src/services/types.ts
@@ -0,0 +1,23 @@
+import { EventAddons, EventData } from '@hawk.so/types';
+
+/**
+ * Event type which is returned by events factory
+ */
+type Event = {
+    _id: string;
+    payload: EventData<EventAddons>;
+};
+
+/**
+ * Interface for interacting with events factory
+ */
+export interface EventsFactoryInterface {
+  /**
+   * Get event repetition
+   *
+   * @param repetitionId - repetition id
+   * @param originalEventId - original event id
+   * @returns {Promise<EventData<EventAddons>>} - event repetition
+   */
+  getEventRepetition(repetitionId: string, originalEventId: string): Promise<Event>;
+}
diff --git a/src/typeDefs/event.ts b/src/typeDefs/event.ts
@@ -262,6 +262,11 @@ type Event {
   """
   repetitionsPortion(cursor: String = null, limit: Int = 10): RepetitionsPortion!
 
+  """
+  AI suggestion for the event
+  """
+  aiSuggestion: String
+
   """
   Array of users who visited event
   """
diff --git a/src/types/vercel-ai.d.ts b/src/types/vercel-ai.d.ts
@@ -0,0 +1,18 @@
+declare module 'ai' {
+    /**
+     * Minimal type for generateText used in server-side integration.
+     */
+    export function generateText(input: {
+        model: any;
+        system?: string;
+        prompt: string;
+    }): Promise<{ text: string }>;
+}
+
+declare module '@ai-sdk/openai' {
+    /**
+     * Minimal types for OpenAI provider.
+     */
+    export function createOpenAI(config?: { apiKey?: string }): (model: string) => any;
+    export const openai: (model: string) => any;
+}
diff --git a/src/types/zod-v4.d.ts b/src/types/zod-v4.d.ts
@@ -0,0 +1,5 @@
+declare module 'zod/v4' {
+    export * from 'zod';
+    import z from 'zod';
+    export default z;
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -41,13 +41,16 @@
 
     /* Module Resolution Options */
     // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
-    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
-    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    "paths": {                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+      "zod/v4": ["src/types/zod-v4.d.ts"]
+    },
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
     // "typeRoots": [],                       /* List of folders to include type definitions from. */
     // "types": [],                           /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    "skipLibCheck": true
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
     // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ export default class CloudPaymentsWebhooks {`
`202`	`202`	`return;`
`203`	`203`	`}`
`204`	`204`
`205`		- telegram.sendMessage(`✅ [Billing / Check] All checks passed successfully «${workspace.name}»`, TelegramBotURLs.Money)
	`205`	+ telegram.sendMessage(`🤗 [Billing / Check] All checks passed successfully «${workspace.name}»`, TelegramBotURLs.Money)
`206`	`206`	`.catch(e => console.error('Error while sending message to Telegram: ' + e));`
`207`	`207`
`208`	`208`	`HawkCatcher.send(new Error('[Billing / Check] All checks passed successfully'), body as any);`