chore: release v9.0.47

dosco · dosco · commit 97fb68160e7e · 2024-09-16T16:42:30.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 
 
+## [9.0.47](https://github.com/ax-llm/ax/compare/9.0.45...9.0.46) (2024-09-16)
+
+
+### Features
+
+* ax web first commit ([bccb572](https://github.com/ax-llm/ax/commit/bccb5722302f0c9746e9f3d3567f97c6fff8de32))
+* first release of rome ([7629b77](https://github.com/ax-llm/ax/commit/7629b77be1e139ad9e1a6d93a30e6b62423bb82f))
+* moved comm. core into useChat hook ([f04c35f](https://github.com/ax-llm/ax/commit/f04c35fc65d5ece9de5cea8a26a8873a15274cde))
+* rome is rising ([5d7c0f3](https://github.com/ax-llm/ax/commit/5d7c0f377ecfde91fb5c7fb142cf367e56e3a7ab))
+
+## [9.0.46](https://github.com/ax-llm/ax/compare/9.0.45...9.0.46) (2024-08-16)
+
+
+### Bug Fixes
+
+* Bind agent functions to instances for correct 'this' context" ([#61](https://github.com/ax-llm/ax/issues/61)) ([ce684ff](https://github.com/ax-llm/ax/commit/ce684ff507e6493b4bfcdae195df5da3ea362e3f))
+
 ## [9.0.46](https://github.com/ax-llm/ax/compare/9.0.44...9.0.45) (2024-08-16)
 
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -84,5 +84,5 @@
   ],
   "author": "Vikram <https://twitter.com/dosco>",
   "private": "true",
-  "version": "9.0.46"
+  "version": "9.0.47"
 }
diff --git a/src/ai-sdk-provider/package.json b/src/ai-sdk-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ax-llm/ax-ai-sdk-provider",
-  "version": "9.0.44",
+  "version": "9.0.45",
   "type": "module",
   "description": "Ax AI SDK Provider for the Vercel AI SDK",
   "repository": {
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@ai-sdk/provider-utils": "^1.0.2",
-    "@ax-llm/ax": "9.0.46",
+    "@ax-llm/ax": "9.0.47",
     "ai": "^3.2.37",
     "zod": "^3.23.8"
   },
diff --git a/src/ax/package.json b/src/ax/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ax-llm/ax",
-  "version": "9.0.46",
+  "version": "9.0.47",
   "type": "module",
   "description": "The best library to work with LLMs",
   "repository": {
diff --git a/src/examples/package.json b/src/examples/package.json
@@ -13,7 +13,7 @@
     "tsx": "node --env-file=.env --import=tsx"
   },
   "dependencies": {
-    "@ax-llm/ax": "9.0.46"
+    "@ax-llm/ax": "9.0.47"
   },
   "devDependencies": {
     "npm-run-all": "^4.1.5",
diff --git a/src/web-api/src/api/memory.ts b/src/web-api/src/api/memory.ts
@@ -79,7 +79,7 @@ export class ChatMemory implements AxAIMemory {
 
 interface GetChatPromptArgs {
   chatId: ObjectId;
-  uptoMessageId: ObjectId;
+  uptoMessageId?: ObjectId;
 }
 
 export const getChatPrompt = async (
diff --git a/src/web-api/src/api/messages.ts b/src/web-api/src/api/messages.ts
@@ -362,10 +362,10 @@ export const chatAgentTaskHandler = async (
 
   try {
     const { response } = await executeChat(hc, {
-      agentId: new ObjectId(agentMessage.agent.id),
-      chatId: new ObjectId(agentMessage.chatId),
-      query: text,
-      uptoMessageId: new ObjectId(agentMessage.parentId)
+      agentId: agentMessage.agent.id,
+      chatId: agentMessage.chatId,
+      queryOrTask: text,
+      uptoMessageId: agentMessage.parentId
     });
 
     const updatedAgentMessage = { ...agentMessage, text: response };
@@ -383,13 +383,13 @@ export const chatAgentTaskHandler = async (
 interface ExecuteChatArgs {
   agentId: ObjectId;
   chatId: ObjectId;
-  query: string;
-  uptoMessageId: ObjectId;
+  queryOrTask: string;
+  uptoMessageId?: ObjectId;
 }
 
 const executeChat = async (
   hc: Readonly<HandlerContext>,
-  { agentId, chatId, query, uptoMessageId }: ExecuteChatArgs
+  { agentId, chatId, queryOrTask, uptoMessageId }: ExecuteChatArgs
 ) => {
   const agent = await hc.db
     .collection<Agent>('agents')
@@ -402,11 +402,13 @@ const executeChat = async (
   const chatHistory = await getChatPrompt(hc.db, { chatId, uptoMessageId });
   const mem = new ChatMemory([]);
   const ai = await createAI(hc, agent, 'big');
+  ai.setOptions({ debug: true });
   const { markdownResponse } = await chatAgent.forward(
     ai,
     {
+      agentDescription: agent.description,
       chatHistory,
-      query
+      queryOrTask
     },
     { mem }
   );
diff --git a/src/web-api/src/api/prompts.ts b/src/web-api/src/api/prompts.ts
@@ -1,10 +1,10 @@
 import { AxGen } from '@ax-llm/ax';
 
 export const chatAgent = new AxGen<
-  { chatHistory?: string[]; query: string },
+  { agentDescription: string; chatHistory?: string[]; queryOrTask: string },
   { markdownResponse: string }
 >(
-  '"You are a helpful chat bot. Respond in markdown. Use markdown codeblocks only for code." query, chatHistory?:string[] -> markdownResponse'
+  '"You are an AI chat agent. Use the provided agent description to guide your behavior. The context of the chat is provided in the chat history use it when responding to your query or performing a task. Respond in markdown. Use markdown codeblocks only for code." agentDescription, chatHistory?:string[], queryOrTask -> markdownResponse'
 );
 
 export const genTitle = new AxGen<
diff --git a/src/web-api/src/api/types.ts b/src/web-api/src/api/types.ts
@@ -17,7 +17,7 @@ export const agent = z.strictObject({
   aiBigModel: ai,
   aiSmallModel: ai,
   createdAt: z.coerce.date(),
-  description: z.string().optional(),
+  description: z.string(),
   name: z.string(),
   updatedAt: z.coerce.date().optional(),
   userId: z.instanceof(ObjectId)
diff --git a/src/web-api/src/types/agents.ts b/src/web-api/src/types/agents.ts
@@ -4,7 +4,7 @@ import { z } from 'zod';
 
 export const getAIListRes = z
   .strictObject({
-    id: IdSchema,
+    id: z.string(),
     models: z
       .strictObject({
         id: z.string(),
@@ -43,7 +43,7 @@ export const ai = z.strictObject({
 export const createUpdateAgentReq = z.strictObject({
   aiBigModel: ai,
   aiSmallModel: ai,
-  description: z.string().min(3).max(1000).optional(),
+  description: z.string().min(3).max(2000),
   name: z.string().min(3).max(100)
 });
 
diff --git a/src/web-ui/src/components/Prose.tsx b/src/web-ui/src/components/Prose.tsx
@@ -4,10 +4,8 @@ interface ProseProps {
 
 export const Prose = ({ children }: ProseProps) => (
   <div
-    className="prose prose-xl dark:prose-invert
-  prose-h1:font-bold prose-h1:text-xl
-  prose-a:text-blue-600 prose-p:text-justify prose-p:m-0 prose-img:rounded-xl
-  prose-headings:underline p-0 m-0"
+    className="prose prose-zinc	prose-base dark:prose-invert
+  prose-h1:font-bold prose-h1:text-xl prose-a:text-blue-600 first:prose-p:m-0 prose-img:rounded-xl first:prose-headings:mt-0 prose-headings:font-medium p-0 m-0 max-w-none"
   >
     {children}
   </div>
diff --git a/src/web-ui/src/components/TextInput.tsx b/src/web-ui/src/components/TextInput.tsx
@@ -1,88 +1,75 @@
-/* eslint-disable react/display-name */
-import { Textarea } from '@/components/ui/textarea.js'
-import { cn } from '@/lib/utils'
+import { Textarea } from '@/components/ui/textarea';
 import React, {
-  type TextareaHTMLAttributes,
-  forwardRef, useEffect, useImperativeHandle, useRef, useState
-} from 'react'
+  ChangeEvent,
+  KeyboardEvent,
+  TextareaHTMLAttributes,
+  useEffect,
+  useRef,
+  useState
+} from 'react';
 
-interface CounterProps {
-  count: number
-  maxCount: number
+interface ChatTextareaProps
+  extends Omit<TextareaHTMLAttributes<HTMLTextAreaElement>, 'rows'> {
+  initialRows?: number;
+  onEnterKeyPressed?: () => void;
 }
 
-const Counter: React.FC<CounterProps> = ({ count, maxCount }) => {
-  const circumference = 2 * Math.PI * 20
-  const percentage = count / maxCount
-  const strokeDasharray = `${percentage * circumference} ${circumference}`
+export const TextInput: React.FC<ChatTextareaProps> = ({
+  className = '',
+  initialRows = 2,
+  onChange,
+  onEnterKeyPressed,
+  placeholder = 'Type your message here...',
+  value,
+  ...props
+}) => {
+  const [rows, setRows] = useState(initialRows);
+  const textareaRef = useRef<HTMLTextAreaElement>(null);
 
-  const getStrokeColor = () => {
-    if (percentage < 0.5) return 'limegreen'
-    if (percentage < 0.75) return 'yellow'
-    return 'red'
-  }
+  const calculateRows = (_text: string) => {
+    const textareaLineHeight = 24; // Adjust this value based on your font size
+    const textarea = textareaRef.current;
+    if (!textarea) return initialRows;
 
-  return (
-    <svg height="20" width="20">
-      <circle
-        cx="10"
-        cy="10"
-        fill="none"
-        r="5"
-        stroke="lightgray" // Background circle color
-        strokeWidth="2"
-      />
-      <circle
-        cx="10"
-        cy="10"
-        fill="none"
-        r="5"
-        stroke={getStrokeColor()}
-        strokeDasharray={strokeDasharray}
-        strokeWidth="2"
-        transform="rotate(-90 10 10)" // To start the progress from the top
-      />
-    </svg>
-  )
-}
+    textarea.style.height = 'auto';
+    textarea.style.height = `${textarea.scrollHeight}px`;
 
-interface TextInputProps extends TextareaHTMLAttributes<HTMLTextAreaElement> {
-  error?: string
-}
+    const currentRows = Math.floor(textarea.scrollHeight / textareaLineHeight);
+    return currentRows < initialRows ? initialRows : currentRows;
+  };
 
-export const TextInput = forwardRef<HTMLTextAreaElement | null, TextInputProps>((props, parentRef) => {
-  const [count, setCount] = useState<number>(0)
-  const internalRef = useRef<HTMLTextAreaElement | null>(null) // create an internal ref
+  const handleChange = (e: ChangeEvent<HTMLTextAreaElement>) => {
+    const newRows = calculateRows(e.target.value);
+    setRows(newRows);
 
-  // Combine refs: use internal ref if parentRef is not provided
-  useImperativeHandle(parentRef, () => internalRef.current!, [internalRef])
+    // Call the original onChange if provided
+    onChange?.(e);
+  };
+
+  const handleKeyDown = (e: KeyboardEvent<HTMLTextAreaElement>) => {
+    if (e.key === 'Enter' && !e.shiftKey) {
+      e.preventDefault();
+      onEnterKeyPressed?.();
+    }
+  };
 
   useEffect(() => {
-    const refCurrent = internalRef.current // use internal ref directly
-    if (refCurrent) {
-      refCurrent.style.height = (refCurrent.scrollHeight) + 'px'
+    if (textareaRef.current) {
+      const newRows = calculateRows(textareaRef.current.value);
+      setRows(newRows);
     }
-  }, [count])
+  }, [value]);
 
   return (
-    <div className={cn('rounded-md', props.className)}>
-      <div className="group flex flex-col focus-within:ring-black overflow-hidden">
-        <Textarea
-          {...props}
-          className="overflow-hidden focus-visible:ring-0 border-hidden resize-none bg-transparent placeholder:text-stone-400 invalid:border-red-500 !rounded-none"
-          onChange={(e) => {
-            setCount(e.target.value.length)
-            if (props.onChange) { props.onChange(e) }
-          }}
-          ref={internalRef} // attach the internal ref
-        />
-        {props.maxLength && count > 0 && (
-          <div className="flex items-center text-sm text-gray-400 gap-1 py-1 bg-transparent border-t-0 px-2 py-1">
-            <Counter count={count} maxCount={props.maxLength} />
-            {props.error ? <div className="text-red-300">{props.error}</div> : <div>{count}/{props.maxLength} characters</div>}
-          </div>
-        )}
-      </div>
-    </div>
-  )
-})
+    <Textarea
+      className={`resize-none transition-all duration-200 ${className}`}
+      onChange={handleChange}
+      onKeyDown={handleKeyDown}
+      placeholder={placeholder}
+      ref={textareaRef}
+      rows={rows}
+      value={value}
+      {...props}
+    />
+  );
+};
diff --git a/src/web-ui/src/components/agents/NewAgentCard.tsx b/src/web-ui/src/components/agents/NewAgentCard.tsx
@@ -5,12 +5,12 @@ import { Link } from 'wouter';
 
 export const NewAgentCard = () => {
   return (
-    <Card className="border border-transparent hover:border-accent/50 p-2 flex items-center justify-center group cursor-pointer">
+    <Card className="p-2 flex items-center justify-center group cursor-pointer shadow-none border">
       <Link
-        className="w-full h-full flex items-center justify-center"
+        className="h-full flex items-center justify-center"
         to="/agents/new"
       >
-        <Button className="w-10 h-10 rounded-full p-0" variant="ghost">
+        <Button className="rounded-full p-0" variant="ghost">
           <Plus className="p-0 h-6 w-6 text-black/50 group-hover:rotate-90 transition-all duration-300" />
         </Button>
         <div className="px-2">Add Agent</div>
diff --git a/src/web-ui/src/components/chats/ChatInput.tsx b/src/web-ui/src/components/chats/ChatInput.tsx
@@ -192,7 +192,7 @@ const ChatInputForm = ({
 
       <Form {...form}>
         <div className="flex justify-between">
-          <div className="space-y-2 w-full">
+          <div className="space-y-1 w-full">
             <MentionedList agents={agents} mentions={mentions} />
 
             <FormField
diff --git a/src/web-ui/src/components/chats/ChatTextarea.tsx b/src/web-ui/src/components/chats/ChatTextarea.tsx
diff --git a/src/web-ui/src/index.css b/src/web-ui/src/index.css
diff --git a/src/web-ui/src/views/CreateUpdateAgent.tsx b/src/web-ui/src/views/CreateUpdateAgent.tsx
diff --git a/src/web-ui/src/views/ListAgents.tsx b/src/web-ui/src/views/ListAgents.tsx

Original file line number	Diff line number	Diff line change
`@@ -84,5 +84,5 @@`
`84`	`84`	`],`
`85`	`85`	`"author": "Vikram <https://twitter.com/dosco>",`
`86`	`86`	`"private": "true",`
`87`		`- "version": "9.0.46"`
	`87`	`+ "version": "9.0.47"`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ax-llm/ax",`
`3`		`- "version": "9.0.46",`
	`3`	`+ "version": "9.0.47",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"description": "The best library to work with LLMs",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ export class ChatMemory implements AxAIMemory {`
`79`	`79`
`80`	`80`	`interface GetChatPromptArgs {`
`81`	`81`	`chatId: ObjectId;`
`82`		`- uptoMessageId: ObjectId;`
	`82`	`+ uptoMessageId?: ObjectId;`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`export const getChatPrompt = async (`