WIP: Refactoring

Author: kinyoklion

packages/sdk/ai/src/LDAIConfigTracker.ts

@@ -6,7 +6,7 @@ import {
   OpenAITokenUsage,
   TokenMetrics,
   TokenUsage,
-  UnderscoreTokenUsage,
+  UnderScoreTokenUsage,
 } from './api/metrics';
 
 export class LDAIConfigTracker {
@@ -15,22 +15,22 @@ export class LDAIConfigTracker {
   private configKey: string;
   private context: LDContext;
 
-  constructor(ldClient: LDClient, configKey: string, variationId: string, context: LDContext) {
+  constructor(ldClient: LDClient, configKey: string, versionId: string, context: LDContext) {
     this.ldClient = ldClient;
-    this.variationId = variationId;
+    this.variationId = versionId;
     this.configKey = configKey;
     this.context = context;
   }
 
-  private getTrackData() {
+  private _getTrackData(): { variationId: string; configKey: string } {
     return {
       variationId: this.variationId,
       configKey: this.configKey,
     };
   }
 
   trackDuration(duration: number): void {
-    this.ldClient.track('$ld:ai:duration:total', this.context, this.getTrackData(), duration);
+    this.ldClient.track('$ld:ai:duration:total', this.context, this._getTrackData(), duration);
   }
 
   async trackDurationOf(func: (...args: any[]) => Promise<any>, ...args: any[]): Promise<any> {
@@ -43,19 +43,19 @@ export class LDAIConfigTracker {
   }
 
   trackError(error: number): void {
-    this.ldClient.track('$ld:ai:error', this.context, this.getTrackData(), error);
+    this.ldClient.track('$ld:ai:error', this.context, this._getTrackData(), error);
   }
 
   trackFeedback(feedback: { kind: FeedbackKind }): void {
     if (feedback.kind === FeedbackKind.Positive) {
-      this.ldClient.track('$ld:ai:feedback:user:positive', this.context, this.getTrackData(), 1);
+      this.ldClient.track('$ld:ai:feedback:user:positive', this.context, this._getTrackData(), 1);
     } else if (feedback.kind === FeedbackKind.Negative) {
-      this.ldClient.track('$ld:ai:feedback:user:negative', this.context, this.getTrackData(), 1);
+      this.ldClient.track('$ld:ai:feedback:user:negative', this.context, this._getTrackData(), 1);
     }
   }
 
   trackGeneration(generation: number): void {
-    this.ldClient.track('$ld:ai:generation', this.context, this.getTrackData(), generation);
+    this.ldClient.track('$ld:ai:generation', this.context, this._getTrackData(), generation);
   }
 
   async trackOpenAI(func: (...args: any[]) => Promise<any>, ...args: any[]): Promise<any> {
@@ -90,37 +90,45 @@ export class LDAIConfigTracker {
     return res;
   }
 
-  trackTokens(tokens: TokenUsage | UnderscoreTokenUsage | { totalTokens: number; inputTokens: number; outputTokens: number }): void {
+  trackTokens(
+    tokens:
+      | TokenUsage
+      | UnderScoreTokenUsage
+      | { totalTokens: number; inputTokens: number; outputTokens: number },
+  ): void {
     const tokenMetrics = toMetrics(tokens);
     if (tokenMetrics.total > 0) {
       this.ldClient.track(
         '$ld:ai:tokens:total',
         this.context,
-        this.getTrackData(),
+        this._getTrackData(),
         tokenMetrics.total,
       );
     }
     if (tokenMetrics.input > 0) {
       this.ldClient.track(
         '$ld:ai:tokens:input',
         this.context,
-        this.getTrackData(),
+        this._getTrackData(),
         tokenMetrics.input,
       );
     }
     if (tokenMetrics.output > 0) {
       this.ldClient.track(
         '$ld:ai:tokens:output',
         this.context,
-        this.getTrackData(),
+        this._getTrackData(),
         tokenMetrics.output,
       );
     }
   }
 }
 
 function toMetrics(
-  usage: TokenUsage | UnderscoreTokenUsage | { totalTokens: number; inputTokens: number; outputTokens: number },
+  usage:
+    | TokenUsage
+    | UnderScoreTokenUsage
+    | { totalTokens: number; inputTokens: number; outputTokens: number },
 ): TokenMetrics {
   if ('inputTokens' in usage && 'outputTokens' in usage) {
     // Bedrock usage
@@ -133,12 +141,12 @@ function toMetrics(
 
   // OpenAI usage (both camelCase and snake_case)
   return {
-    total: 'total_tokens' in usage ? usage.total_tokens! : (usage as TokenUsage).totalTokens ?? 0,
+    total: 'total_tokens' in usage ? usage.total_tokens! : ((usage as TokenUsage).totalTokens ?? 0),
     input:
-      'prompt_tokens' in usage ? usage.prompt_tokens! : (usage as TokenUsage).promptTokens ?? 0,
+      'prompt_tokens' in usage ? usage.prompt_tokens! : ((usage as TokenUsage).promptTokens ?? 0),
     output:
       'completion_tokens' in usage
         ? usage.completion_tokens!
-        : (usage as TokenUsage).completionTokens ?? 0,
+        : ((usage as TokenUsage).completionTokens ?? 0),
   };
 }

packages/sdk/ai/src/api/config/LDAIConfigTracker.ts

@@ -1,11 +1,11 @@
-import { FeedbackKind, TokenUsage, UnderscoreTokenUsage } from '../metrics';
+import { FeedbackKind, TokenUsage, UnderScoreTokenUsage } from '../metrics';
 
 export interface LDAIConfigTracker {
   trackDuration: (duration: number) => void;
   trackTokens: (
     tokens:
       | TokenUsage
-      | UnderscoreTokenUsage
+      | UnderScoreTokenUsage
       | { totalTokens: number; inputTokens: number; outputTokens: number },
   ) => void;
   trackError: (error: number) => void;

packages/sdk/ai/src/api/metrics/UnderscoreTokenUsage.ts renamed to packages/sdk/ai/src/api/metrics/UnderScoreTokenUsage.ts

@@ -1,4 +1,4 @@
-export class UnderscoreTokenUsage {
+export class UnderScoreTokenUsage {
   total_tokens: number;
   prompt_tokens: number;
   completion_tokens: number;

packages/sdk/ai/src/trackUtils.ts

@@ -1,7 +1,7 @@
-import { BedrockTokenUsage, TokenMetrics, TokenUsage, UnderscoreTokenUsage } from './api/metrics';
+import { BedrockTokenUsage, TokenMetrics, TokenUsage, UnderScoreTokenUsage } from './api/metrics';
 
 export function usageToTokenMetrics(
-  usage: TokenUsage | UnderscoreTokenUsage | BedrockTokenUsage,
+  usage: TokenUsage | UnderScoreTokenUsage | BedrockTokenUsage,
 ): TokenMetrics {
   if ('inputTokens' in usage && 'outputTokens' in usage) {
     // Bedrock usage

packages/sdk/ai/tsconfig.eslint.json

@@ -2,4 +2,4 @@
 	"extends": "./tsconfig.json",
 	"include": ["/**/*.ts"],
 	"exclude": ["node_modules"]
-      }
+}

packages/sdk/ai/tsconfig.json

@@ -1,12 +1,34 @@
 {
   "compilerOptions": {
-    "target": "ES2017",
-    "module": "commonjs",
+    "allowSyntheticDefaultImports": true,
     "declaration": true,
-    "outDir": "./dist",
+    "declarationMap": true,
+    "lib": ["ES2017", "dom"],
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "noImplicitOverride": true,
+    "resolveJsonModule": true,
+    "rootDir": ".",
+    "outDir": "dist",
+    "skipLibCheck": true,
+    "sourceMap": false,
     "strict": true,
-    "esModuleInterop": true
+    "stripInternal": true,
+    "target": "ES2017",
+    "types": ["node", "jest"],
+    "allowJs": true
   },
   "include": ["src"],
-  "exclude": ["node_modules", "**/*.test.ts"]
-}
+  "exclude": [
+    "vite.config.ts",
+    "__tests__",
+    "dist",
+    "docs",
+    "example",
+    "node_modules",
+    "babel.config.js",
+    "setup-jest.js",
+    "rollup.config.js",
+    "**/*.test.ts*"
+  ]
+}