Merge branch 'main' into v3-cost-tracking

langfuse · Dec 16, 2024 · 77ea34b · 77ea34b
2 parents 7ec9bc7 + 8d4b973
commit 77ea34b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/langfuse-core/src/release-env.ts b/langfuse-core/src/release-env.ts
@@ -18,6 +18,8 @@ const common_release_envs = [
   "REACT_APP_GIT_SHA",
   // Heroku
   "SOURCE_VERSION",
+  // Trigger.dev
+  "TRIGGER_DEPLOYMENT_ID",
 ] as const;
 
 export function getCommonReleaseEnvs(): string | undefined {

diff --git a/langfuse/src/openai/observeOpenAI.ts b/langfuse/src/openai/observeOpenAI.ts
@@ -38,7 +38,8 @@ export const observeOpenAI = <SDKType extends object>(
 
       const defaultGenerationName = `${sdk.constructor?.name}.${propKey.toString()}`;
       const generationName = langfuseConfig?.generationName ?? defaultGenerationName;
-      const config = { ...langfuseConfig, generationName };
+      const traceName = langfuseConfig && "traceName" in langfuseConfig ? langfuseConfig.traceName : generationName;
+      const config = { ...langfuseConfig, generationName, traceName };
 
       // Add a flushAsync method to the OpenAI SDK that flushes the Langfuse client
       if (propKey === "flushAsync") {

diff --git a/langfuse/src/openai/traceMethod.ts b/langfuse/src/openai/traceMethod.ts
@@ -68,6 +68,7 @@ const wrapMethod = async <T extends GenericMethod>(
       ...config,
       ...observationData,
       id: config?.traceId,
+      name: config?.traceName,
       timestamp: observationData.startTime,
     });
   }

diff --git a/langfuse/src/openai/types.ts b/langfuse/src/openai/types.ts
@@ -24,7 +24,11 @@ type LangfuseGenerationConfig = Pick<
   "metadata" | "version" | "promptName" | "promptVersion"
 >;
 
-export type LangfuseNewTraceConfig = LangfuseTraceConfig & { traceId?: string; clientInitParams?: LangfuseInitParams };
+export type LangfuseNewTraceConfig = LangfuseTraceConfig & {
+  traceId?: string;
+  traceName?: string;
+  clientInitParams?: LangfuseInitParams;
+};
 export type LangfuseParent = LangfuseTraceClient | LangfuseSpanClient | LangfuseGenerationClient;
 export type LangfuseWithParentConfig = LangfuseGenerationConfig & { parent: LangfuseParent };