Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix utils #76

Merged
merged 2 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 0.13.9

- Fix for browser runtime

## 0.13.8

- New Handlebars helpers: last, toJSON, formatMessage (more variants)

## 0.13.7

- Fix react peerDependency version syntax #73
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "langtail",
"version": "0.13.7",
"version": "0.13.9",
"description": "",
"main": "./Langtail.js",
"packageManager": "[email protected]",
Expand Down
2 changes: 1 addition & 1 deletion src/LangtailMessages.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

import { assistantMessageListResponseSchema, assistantMessageSchema, deleteEntitySchema } from "./schemas"
import { IFetcher, LangtailThreadsOptions, PaginationOptions, PublicAPI } from './types';
import { paginationParamsToQuery } from "./bin/utils";
import { paginationParamsToQuery } from "./utils";


export type ILangtailMessages = PublicAPI<LangtailMessages>
Expand Down
2 changes: 1 addition & 1 deletion src/LangtailThreads.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { deleteEntitySchema, ThreadCreate, threadListResponseSchema, threadSchema } from "./schemas"
import { ILangtailMessages, LangtailMessages } from "./LangtailMessages";
import { IFetcher, LangtailThreadsOptions, PaginationOptions, PublicAPI } from "./types";
import { paginationParamsToQuery } from "./bin/utils";
import { paginationParamsToQuery } from "./utils";

export type ILangtailThreads = PublicAPI<LangtailThreads>

Expand Down
11 changes: 0 additions & 11 deletions src/bin/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,3 @@ export const dirExists = (dir: string): boolean => {
return false;
}
}

export const paginationParamsToQuery = (paginationOptions: { after?: string, limit?: number }): string => {
if (Object.values(paginationOptions ?? {}).every(value => value === undefined)) {
return '';
}

return `?${Object.entries(paginationOptions).reduce((params: URLSearchParams, [key, value]) => {
params.set(key, String(value))
return params
}, new URLSearchParams()).toString()}`
}
41 changes: 41 additions & 0 deletions src/handlebars-helpers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type handlebars from "@langtail/handlebars-evalless"
import { format, parseISO } from "date-fns"
import { Message } from "./schemas"

const isObject = function (val: any) {
return typeof val === "object"
Expand Down Expand Up @@ -68,3 +69,43 @@ export const operatorHelpers: handlebars.HelperDeclareSpec = {
return Array.prototype.slice.call(arguments, 0, -1).some(Boolean)
},
}

const formatMessage = (message: Message, includeToolCalls: boolean): string => {
if (!message) return '';

let result = `[${message.role}] `;

if (message.content) {
result += message.content;
}

if (includeToolCalls && message.tool_calls?.length) {
result += '\nTool Calls:';
for (const tool of message.tool_calls) {
result += `\n - ${tool.function.name}(${tool.function.arguments})`;
}
}

return result;
};

const formatMessages = (messages: Message[], includeToolCalls: boolean): string => {
if (!Array.isArray(messages)) return '';
return messages.map((m) => formatMessage(m, includeToolCalls)).join('\n\n');
};

export const variableHelpers: handlebars.HelperDeclareSpec = {
toJSON: function (context) {
return JSON.stringify(context, null, 2);
},
last: function (array) {
if (Array.isArray(array) && array.length > 0) {
return array[array.length - 1];
}
return null;
},
formatMessage: (message: Message) => formatMessage(message, false),
formatMessages: (messages: Message[]) => formatMessages(messages, false),
formatMessageWithToolCalls: (message: Message) => formatMessage(message, true),
formatMessagesWithToolCalls: (messages: Message[]) => formatMessages(messages, true),
}
10 changes: 9 additions & 1 deletion src/template.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
import handlebarsEvalless from "@langtail/handlebars-evalless"

import { handlebarsDateHelper, operatorHelpers } from "./handlebars-helpers"
import { handlebarsDateHelper, operatorHelpers, variableHelpers } from "./handlebars-helpers"
import { JSONValue } from "./jsonType"
import { ContentArray } from "./schemas"

const handlebars = handlebarsEvalless.default ?? handlebarsEvalless

handlebars.registerHelper("$date", handlebarsDateHelper)
handlebars.registerHelper(operatorHelpers)
handlebars.registerHelper(variableHelpers)

export const LANGTAIL_HELPERS = [
"$date",
...Object.keys(operatorHelpers),
...Object.keys(variableHelpers),
]

const Visitor = handlebars.Visitor

/*
Expand Down
10 changes: 10 additions & 0 deletions src/utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export const paginationParamsToQuery = (paginationOptions: { after?: string, limit?: number }): string => {
if (Object.values(paginationOptions ?? {}).every(value => value === undefined)) {
return '';
}

return `?${Object.entries(paginationOptions).reduce((params: URLSearchParams, [key, value]) => {
params.set(key, String(value))
return params
}, new URLSearchParams()).toString()}`
}
Loading