From 5ca128975826533aa6c0f63835135bbaef56c2bd Mon Sep 17 00:00:00 2001
From: Kumaran Rajendhiran <kumaran@airt.ai>
Date: Mon, 1 Jul 2024 14:01:14 +0530
Subject: [PATCH 1/7] Fix retrieving bing api key in websurfer (#470)

* Fix retrieving bing api key in websurfer

* Include missing together model
---
 fastagency/models/agents/web_surfer.py | 11 ++++++++++-
 fastagency/models/llms/together.py     |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/fastagency/models/agents/web_surfer.py b/fastagency/models/agents/web_surfer.py
index 40cb5edd..ef01fc13 100644
--- a/fastagency/models/agents/web_surfer.py
+++ b/fastagency/models/agents/web_surfer.py
@@ -63,9 +63,18 @@ async def create_autogen(
             my_model.summarizer_llm.uuid, user_id
         )
 
+        bing_api_key = None
+        if my_model.bing_api_key:
+            bing_api_key_model = await my_model.bing_api_key.get_data_model().from_db(
+                my_model.bing_api_key.uuid
+            )
+            bing_api_key = await bing_api_key_model.create_autogen(
+                my_model.bing_api_key.uuid, user_id
+            )
+
         browser_config = {
             "viewport_size": my_model.viewport_size,
-            "bing_api_key": my_model.bing_api_key,
+            "bing_api_key": bing_api_key,
         }
         agent_name = my_model.name
 
diff --git a/fastagency/models/llms/together.py b/fastagency/models/llms/together.py
index 517c43b0..f777de67 100644
--- a/fastagency/models/llms/together.py
+++ b/fastagency/models/llms/together.py
@@ -49,6 +49,7 @@
     "Platypus2 Instruct (70B)": "garage-bAInd/Platypus2-70B-instruct",
     "Gemma Instruct (2B)": "google/gemma-2b-it",
     "Gemma Instruct (7B)": "google/gemma-7b-it",
+    "Gemma-2 Instruct (9B)": "google/gemma-2-9b-it",
     "Vicuna v1.5 (13B)": "lmsys/vicuna-13b-v1.5",
     "Vicuna v1.5 (7B)": "lmsys/vicuna-7b-v1.5",
     "Reserved - DBRX Instruct": "medaltv/dbrx-instruct",

From 7cfd526a673111a8f050c16788a27331dd2a7d3c Mon Sep 17 00:00:00 2001
From: Harish Mohan Raj <harish@airt.ai>
Date: Mon, 1 Jul 2024 16:14:55 +0530
Subject: [PATCH 2/7] Support for multiline chat query (#471)

---
 app/package-lock.json                         | 54 +++++++++++
 app/package.json                              |  1 +
 app/src/client/components/ChatForm.tsx        | 49 ++++++++--
 .../client/components/SelectTeamToChat.tsx    | 12 ++-
 app/src/client/tests/ChatForm.test.tsx        | 91 +++++++++++++++++++
 5 files changed, 197 insertions(+), 10 deletions(-)

diff --git a/app/package-lock.json b/app/package-lock.json
index 51eb4d4a..29675839 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -27,6 +27,7 @@
         "react-apexcharts": "^1.4.1",
         "react-hot-toast": "^2.4.1",
         "react-icons": "4.11.0",
+        "react-textarea-autosize": "^8.5.3",
         "stripe": "11.15.0",
         "tailwind-merge": "^2.2.1",
         "uuid": "^9.0.1",
@@ -9514,6 +9515,22 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "node_modules/react-textarea-autosize": {
+      "version": "8.5.3",
+      "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.5.3.tgz",
+      "integrity": "sha512-XT1024o2pqCuZSuBt9FwHlaDeNtVrtCXu0Rnz88t1jUGheCLa3PhjE1GH8Ctm2axEtvdCl5SUHYschyQ0L5QHQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.20.13",
+        "use-composed-ref": "^1.3.0",
+        "use-latest": "^1.2.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -10908,6 +10925,43 @@
         "requires-port": "^1.0.0"
       }
     },
+    "node_modules/use-composed-ref": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.3.0.tgz",
+      "integrity": "sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ==",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/use-isomorphic-layout-effect": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
+      "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/use-latest": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.2.1.tgz",
+      "integrity": "sha512-xA+AVm/Wlg3e2P/JiItTziwS7FK92LWrDB0p+hgXloIMuVCeJJ8v6f0eeHyPZaJrM+usM1FkFfbNCrJGs8A/zw==",
+      "dependencies": {
+        "use-isomorphic-layout-effect": "^1.1.1"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/use-sync-external-store": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz",
diff --git a/app/package.json b/app/package.json
index dc94d874..700357b9 100644
--- a/app/package.json
+++ b/app/package.json
@@ -26,6 +26,7 @@
     "tailwind-merge": "^2.2.1",
     "uuid": "^9.0.1",
     "wasp": "file:.wasp/out/sdk/wasp",
+    "react-textarea-autosize": "^8.5.3",
     "zod": "3.22.4"
   },
   "devDependencies": {
diff --git a/app/src/client/components/ChatForm.tsx b/app/src/client/components/ChatForm.tsx
index 5f8cb1a8..53b49d20 100644
--- a/app/src/client/components/ChatForm.tsx
+++ b/app/src/client/components/ChatForm.tsx
@@ -1,6 +1,10 @@
-import { type Chat } from 'wasp/entities';
 import React, { useRef, useState, useEffect, useCallback } from 'react';
 
+import _ from 'lodash';
+import TextareaAutosize from 'react-textarea-autosize';
+
+import { type Chat } from 'wasp/entities';
+
 interface ChatFormProps {
   handleFormSubmit: (userQuery: string) => void;
   currentChatDetails: Chat;
@@ -9,6 +13,8 @@ interface ChatFormProps {
 
 export default function ChatForm({ handleFormSubmit, currentChatDetails, triggerChatFormSubmitMsg }: ChatFormProps) {
   const [formInputValue, setFormInputValue] = useState('');
+  const [disableFormSubmit, setDisableFormSubmit] = useState(false);
+  const [isSubmitting, setIsSubmitting] = useState(false);
 
   const formInputRef = useCallback(
     async (node: any) => {
@@ -20,17 +26,30 @@ export default function ChatForm({ handleFormSubmit, currentChatDetails, trigger
     [triggerChatFormSubmitMsg]
   );
 
+  useEffect(() => {
+    if (currentChatDetails) {
+      setDisableFormSubmit(currentChatDetails.team_status === 'inprogress');
+    } else {
+      setDisableFormSubmit(false);
+    }
+  }, [currentChatDetails]);
+
   const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault();
+    if (isSubmitting || disableFormSubmit) return;
+
     if (!currentChatDetails.showLoader) {
       setFormInputValue('');
       handleFormSubmit(formInputValue);
+      setIsSubmitting(false);
     }
   };
 
+  const debouncedHandleSubmit = _.debounce(handleSubmit, 500);
+
   return (
     <div className='mt-2 mb-2'>
-      <form data-testid='chat-form' onSubmit={handleSubmit} className=''>
+      <form data-testid='chat-form' onSubmit={debouncedHandleSubmit} className=''>
         <label
           htmlFor='search'
           className='mb-2 text-sm font-medium text-captn-dark-blue sr-only dark:text-airt-font-base'
@@ -38,20 +57,36 @@ export default function ChatForm({ handleFormSubmit, currentChatDetails, trigger
           Search
         </label>
         <div className='relative bottom-0 left-0 right-0 flex items-center justify-between m-1'>
-          <input
-            type='search'
+          <TextareaAutosize
+            minRows={1}
+            maxRows={4}
+            style={{
+              lineHeight: 2,
+              resize: 'none',
+            }}
             id='userQuery'
             name='search'
             className='block rounded-lg w-full h-12 text-sm text-airt-font-base bg-airt-primary focus:outline-none focus:ring-0 focus:border-captn-light-blue'
             placeholder='Enter your message...'
-            // required
+            required
+            disabled={disableFormSubmit}
             ref={formInputRef}
             value={formInputValue}
             onChange={(e) => setFormInputValue(e.target.value)}
+            onKeyDown={(e) => {
+              if (e.key === 'Enter' && !e.shiftKey) {
+                e.preventDefault();
+                debouncedHandleSubmit(e as any);
+              }
+            }}
           />
           <button
-            type='submit'
-            className={`text-airt-primary bg-airt-secondary hover:opacity-90 absolute right-2 font-medium rounded-lg text-sm px-1.5 py-1.5`}
+            type='button'
+            disabled={disableFormSubmit}
+            onClick={debouncedHandleSubmit}
+            className={`text-airt-primary bg-airt-secondary hover:opacity-90 absolute right-2 font-medium rounded-lg text-sm px-1.5 py-1.5 ${
+              disableFormSubmit ? 'cursor-not-allowed bg-white opacity-70 hover:opacity-70' : 'cursor-pointer'
+            }`}
           >
             <span className=''>
               <svg width='24' height='24' viewBox='0 0 24 24' fill='none' className='text-airt-primary'>
diff --git a/app/src/client/components/SelectTeamToChat.tsx b/app/src/client/components/SelectTeamToChat.tsx
index 0fa6dd5e..4e7eedd8 100644
--- a/app/src/client/components/SelectTeamToChat.tsx
+++ b/app/src/client/components/SelectTeamToChat.tsx
@@ -8,7 +8,7 @@ import { CreateNewChatProps } from '../interfaces/PlaygroundPageInterface';
 import CustomBreadcrumb from './CustomBreadcrumb';
 import NotificationBox from './NotificationBox';
 import { SelectInput } from './form/SelectInput';
-import { TextArea } from './form/TextArea';
+import { TextInput } from './form/TextInput';
 import { getModels, createNewChat, useQuery } from 'wasp/client/operations';
 
 const SelectTeamToChat = ({ userTeams }: any) => {
@@ -81,7 +81,13 @@ const SelectTeamToChat = ({ userTeams }: any) => {
             <label className='text-airt-primary inline-block' htmlFor='setSystemMessage'>
               Message
             </label>
-            <TextArea id='setSystemMessage' value={message} placeholder='' onChange={handleMessageChange} />
+            <TextInput
+              type='string'
+              id='setSystemMessage'
+              value={message}
+              placeholder=''
+              onChange={handleMessageChange}
+            />
             {formError && (
               <div className='mb-2' style={{ color: 'red' }}>
                 {formError.message}
@@ -91,7 +97,7 @@ const SelectTeamToChat = ({ userTeams }: any) => {
               className='rounded-md px-3.5 py-2.5 text-sm  bg-airt-primary text-airt-font-base   hover:bg-opacity-85 shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600'
               type='submit'
             >
-              Run
+              Send
             </button>
           </form>
         </div>
diff --git a/app/src/client/tests/ChatForm.test.tsx b/app/src/client/tests/ChatForm.test.tsx
index 44475e24..35973ca5 100644
--- a/app/src/client/tests/ChatForm.test.tsx
+++ b/app/src/client/tests/ChatForm.test.tsx
@@ -84,4 +84,95 @@ describe('ChatForm', () => {
 
     await waitFor(() => expect(handleFormSubmit).toHaveBeenCalledWith(formInputValue));
   });
+
+  test('submits the form only once when submitted multiple times quickly', async () => {
+    const handleFormSubmit = vi.fn();
+    const currentChatDetails: Chat = {
+      id: 1,
+      uuid: '1312312312321313',
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      team_id: 1,
+      team_name: '',
+      team_status: '',
+      userRespondedWithNextAction: false,
+      agentChatHistory: '',
+      isExceptionOccured: false,
+      showLoader: false,
+      streamAgentResponse: false,
+      customerBrief: '',
+      userId: 1,
+      name: '',
+      isChatNameUpdated: false,
+      selectedTeam: '',
+      isChatTerminated: false,
+    };
+
+    renderInContext(
+      <ChatForm
+        handleFormSubmit={handleFormSubmit}
+        currentChatDetails={currentChatDetails}
+        triggerChatFormSubmitMsg={null}
+      />
+    );
+    expect(screen.getByTestId('chat-form')).toBeInTheDocument();
+
+    const formInputValue = 'Hello World!';
+    const input = screen.getByPlaceholderText('Enter your message...');
+    fireEvent.change(input, { target: { value: formInputValue } });
+    // @ts-ignore
+    expect(input.value).toBe(formInputValue);
+    const form = screen.getByTestId('chat-form');
+
+    // Simulate multiple form submissions within 500 ms
+    for (let i = 0; i < 10; i++) {
+      fireEvent.submit(form);
+    }
+
+    await waitFor(() => expect(handleFormSubmit).toHaveBeenCalledTimes(1));
+  });
+
+  test('does not submit when the chat message is empty', async () => {
+    const handleFormSubmit = vi.fn();
+    const currentChatDetails: Chat = {
+      id: 1,
+      uuid: '1312312312321313',
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      team_id: 1,
+      team_name: '',
+      team_status: '',
+      userRespondedWithNextAction: false,
+      agentChatHistory: '',
+      isExceptionOccured: false,
+      showLoader: false,
+      streamAgentResponse: false,
+      customerBrief: '',
+      userId: 1,
+      name: '',
+      isChatNameUpdated: false,
+      selectedTeam: '',
+      isChatTerminated: false,
+    };
+
+    renderInContext(
+      <ChatForm
+        handleFormSubmit={handleFormSubmit}
+        currentChatDetails={currentChatDetails}
+        triggerChatFormSubmitMsg={null}
+      />
+    );
+    expect(screen.getByTestId('chat-form')).toBeInTheDocument();
+
+    const input = screen.getByPlaceholderText('Enter your message...');
+    fireEvent.change(input, { target: { value: '' } });
+    // @ts-ignore
+    expect(input.value).toBe('');
+
+    // Simulate form submission
+    const form = screen.getByTestId('chat-form');
+    fireEvent.submit(form);
+
+    await waitFor(() => expect(handleFormSubmit).not.toHaveBeenCalled());
+  });
 });

From 589c0616f0834123db8c4e4c1997f6d0c68e8987 Mon Sep 17 00:00:00 2001
From: Harish Mohan Raj <harish@airt.ai>
Date: Mon, 1 Jul 2024 17:40:36 +0530
Subject: [PATCH 3/7] Clicking the secret or any other tab does not navigate to
 the previous screen (#476)

* WIP

* Added functionality to display property list when a property is selected in the side navigation

---------

Co-authored-by: Kumaran Rajendhiran <kumaran@airt.ai>
---
 app/src/client/app/BuildPage.tsx              | 31 ++-----
 .../client/components/buildPage/Agents.tsx    | 21 -----
 .../components/buildPage/Deployments.tsx      | 21 -----
 app/src/client/components/buildPage/LLMs.tsx  | 21 -----
 .../client/components/buildPage/Secrets.tsx   | 21 -----
 app/src/client/components/buildPage/Teams.tsx | 21 -----
 .../client/components/buildPage/ToolBoxes.tsx | 21 -----
 .../buildPage/UserPropertyHandler.tsx         | 93 ++++++++++++-------
 .../client/interfaces/BuildPageInterfaces.ts  |  2 +-
 9 files changed, 66 insertions(+), 186 deletions(-)
 delete mode 100644 app/src/client/components/buildPage/Agents.tsx
 delete mode 100644 app/src/client/components/buildPage/Deployments.tsx
 delete mode 100644 app/src/client/components/buildPage/LLMs.tsx
 delete mode 100644 app/src/client/components/buildPage/Secrets.tsx
 delete mode 100644 app/src/client/components/buildPage/Teams.tsx
 delete mode 100644 app/src/client/components/buildPage/ToolBoxes.tsx

diff --git a/app/src/client/app/BuildPage.tsx b/app/src/client/app/BuildPage.tsx
index b585b02b..f3777ef7 100644
--- a/app/src/client/app/BuildPage.tsx
+++ b/app/src/client/app/BuildPage.tsx
@@ -7,33 +7,15 @@ import CustomAuthRequiredLayout from './layout/CustomAuthRequiredLayout';
 import CustomSidebar from '../components/CustomSidebar';
 import { cn } from '../../shared/utils';
 
-import Secrets from '../components/buildPage/Secrets';
-import LLMs from '../components/buildPage/LLMs';
-import Agents from '../components/buildPage/Agents';
-import Teams from '../components/buildPage/Teams';
-import ToolBoxes from '../components/buildPage/ToolBoxes';
-import Deployment from '../components/buildPage/Deployments';
 import LoadingComponent from '../components/LoadingComponent';
 import { useBuildPage } from '../hooks/useBuildPage';
 import { filerOutComponentData } from '../utils/buildPageUtils';
+import UserPropertyHandler from '../components/buildPage/UserPropertyHandler';
 
 interface BuildPageProps {
   user: User;
 }
 
-interface componentsMapType {
-  [key: string]: React.FC<any>;
-}
-
-const componentsMap: componentsMapType = {
-  secret: Secrets,
-  llm: LLMs,
-  agent: Agents,
-  team: Teams,
-  toolbox: ToolBoxes,
-  deployment: Deployment,
-};
-
 interface HeaderProps {
   sidebarOpen: boolean;
   setSidebarOpen: (open: boolean) => void;
@@ -113,6 +95,7 @@ const BuildPage = ({ user }: BuildPageProps) => {
   const { data, loading, error } = useBuildPage();
   const [sidebarOpen, setSidebarOpen] = useState(false);
   const [sideNavSelectedItem, setSideNavSelectedItem] = useState('secret');
+  const [togglePropertyList, setTogglePropertyList] = useState(false);
 
   const wrapperClass = document.body.classList.contains('server-error')
     ? 'h-[calc(100vh-173px)]'
@@ -142,11 +125,10 @@ const BuildPage = ({ user }: BuildPageProps) => {
 
   const handleSideNavItemClick = (selectedComponentName: string) => {
     setSideNavSelectedItem(selectedComponentName);
+    setTogglePropertyList(!togglePropertyList);
     sessionStorage.setItem('selectedBuildPageTab', selectedComponentName);
   };
 
-  const ComponentToRender = data && componentsMap[sideNavSelectedItem];
-
   return (
     <div className='dark:bg-boxdark-2 dark:text-bodydark bg-captn-light-blue'>
       {/* <!-- ===== Page Wrapper Start ===== --> */}
@@ -176,8 +158,11 @@ const BuildPage = ({ user }: BuildPageProps) => {
                 >
                   Oops! Something went wrong. Our server is currently unavailable. Please try again later.
                 </p>
-              ) : ComponentToRender ? (
-                <ComponentToRender data={filerOutComponentData(data, sideNavSelectedItem)} />
+              ) : data ? (
+                <UserPropertyHandler
+                  data={filerOutComponentData(data, sideNavSelectedItem)}
+                  togglePropertyList={togglePropertyList}
+                />
               ) : (
                 <p
                   className='absolute top-1/3 left-1/2 -translate-x-1/2 -translate-y-1/2 text-xl md:text-6xl text-airt-font-base'
diff --git a/app/src/client/components/buildPage/Agents.tsx b/app/src/client/components/buildPage/Agents.tsx
deleted file mode 100644
index fb86a6e4..00000000
--- a/app/src/client/components/buildPage/Agents.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import CustomBreadcrumb from '../CustomBreadcrumb';
-import UserPropertyHandler from './UserPropertyHandler';
-import { SecretsProps } from '../../interfaces/BuildPageInterfaces';
-
-const Agents = ({ data }: SecretsProps) => {
-  return (
-    <>
-      <CustomBreadcrumb pageName='Agents' />
-      <div className='flex flex-col gap-10'>
-        <div className='flex flex-col gap-4'>
-          <div className='rounded-lg border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark min-h-[300px] sm:min-h-[600px]'>
-            <UserPropertyHandler data={data} />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default Agents;
diff --git a/app/src/client/components/buildPage/Deployments.tsx b/app/src/client/components/buildPage/Deployments.tsx
deleted file mode 100644
index de5f125f..00000000
--- a/app/src/client/components/buildPage/Deployments.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import CustomBreadcrumb from '../CustomBreadcrumb';
-import UserPropertyHandler from './UserPropertyHandler';
-import { SecretsProps } from '../../interfaces/BuildPageInterfaces';
-
-const Deployments = ({ data }: SecretsProps) => {
-  return (
-    <>
-      <CustomBreadcrumb pageName='Deployments' />
-      <div className='flex flex-col gap-10'>
-        <div className='flex flex-col gap-4'>
-          <div className='rounded-lg border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark min-h-[300px] sm:min-h-[600px]'>
-            <UserPropertyHandler data={data} />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default Deployments;
diff --git a/app/src/client/components/buildPage/LLMs.tsx b/app/src/client/components/buildPage/LLMs.tsx
deleted file mode 100644
index 71cae3cc..00000000
--- a/app/src/client/components/buildPage/LLMs.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import CustomBreadcrumb from '../CustomBreadcrumb';
-import UserPropertyHandler from './UserPropertyHandler';
-import { SecretsProps } from '../../interfaces/BuildPageInterfaces';
-
-const LLMs = ({ data }: SecretsProps) => {
-  return (
-    <>
-      <CustomBreadcrumb pageName='LLMs' />
-      <div className='flex flex-col gap-10'>
-        <div className='flex flex-col gap-4'>
-          <div className='rounded-lg border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark min-h-[300px] sm:min-h-[600px]'>
-            <UserPropertyHandler data={data} />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default LLMs;
diff --git a/app/src/client/components/buildPage/Secrets.tsx b/app/src/client/components/buildPage/Secrets.tsx
deleted file mode 100644
index e9f63d9a..00000000
--- a/app/src/client/components/buildPage/Secrets.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import CustomBreadcrumb from '../CustomBreadcrumb';
-import UserPropertyHandler from './UserPropertyHandler';
-import { SecretsProps } from '../../interfaces/BuildPageInterfaces';
-
-const Secrets = ({ data }: SecretsProps) => {
-  return (
-    <>
-      <CustomBreadcrumb pageName='Secrets' />
-      <div className='flex flex-col gap-10'>
-        <div className='flex flex-col gap-4'>
-          <div className='rounded-lg border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark min-h-[300px] sm:min-h-[600px]'>
-            <UserPropertyHandler data={data} />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default Secrets;
diff --git a/app/src/client/components/buildPage/Teams.tsx b/app/src/client/components/buildPage/Teams.tsx
deleted file mode 100644
index af197646..00000000
--- a/app/src/client/components/buildPage/Teams.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import CustomBreadcrumb from '../CustomBreadcrumb';
-import UserPropertyHandler from './UserPropertyHandler';
-import { SecretsProps } from '../../interfaces/BuildPageInterfaces';
-
-const Teams = ({ data }: SecretsProps) => {
-  return (
-    <>
-      <CustomBreadcrumb pageName='Teams' />
-      <div className='flex flex-col gap-10'>
-        <div className='flex flex-col gap-4'>
-          <div className='rounded-lg border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark min-h-[300px] sm:min-h-[600px]'>
-            <UserPropertyHandler data={data} />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default Teams;
diff --git a/app/src/client/components/buildPage/ToolBoxes.tsx b/app/src/client/components/buildPage/ToolBoxes.tsx
deleted file mode 100644
index bc3b0dda..00000000
--- a/app/src/client/components/buildPage/ToolBoxes.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import CustomBreadcrumb from '../CustomBreadcrumb';
-import UserPropertyHandler from './UserPropertyHandler';
-import { SecretsProps } from '../../interfaces/BuildPageInterfaces';
-
-const ToolBoxes = ({ data }: SecretsProps) => {
-  return (
-    <>
-      <CustomBreadcrumb pageName='ToolBoxes' />
-      <div className='flex flex-col gap-10'>
-        <div className='flex flex-col gap-4'>
-          <div className='rounded-lg border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark min-h-[300px] sm:min-h-[600px]'>
-            <UserPropertyHandler data={data} />
-          </div>
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default ToolBoxes;
diff --git a/app/src/client/components/buildPage/UserPropertyHandler.tsx b/app/src/client/components/buildPage/UserPropertyHandler.tsx
index 051d5a14..6b0a5853 100644
--- a/app/src/client/components/buildPage/UserPropertyHandler.tsx
+++ b/app/src/client/components/buildPage/UserPropertyHandler.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import _ from 'lodash';
 
 import Button from '../Button';
@@ -7,7 +7,8 @@ import ModelsList from '../ModelsList';
 import NotificationBox from '../NotificationBox';
 
 import { SelectedModelSchema } from '../../interfaces/BuildPageInterfaces';
-import { SecretsProps } from '../../interfaces/BuildPageInterfaces';
+import { PropertyTypeProps } from '../../interfaces/BuildPageInterfaces';
+import { navLinkItems } from '../CustomSidebar';
 
 import {
   getModels,
@@ -26,8 +27,14 @@ import {
   dependsOnProperty,
 } from '../../utils/buildPageUtils';
 import Loader from '../../admin/common/Loader';
+import CustomBreadcrumb from '../CustomBreadcrumb';
 
-const UserPropertyHandler = ({ data }: SecretsProps) => {
+interface Props {
+  data: any;
+  togglePropertyList: boolean;
+}
+
+const UserPropertyHandler = ({ data, togglePropertyList }: Props) => {
   const [isLoading, setIsLoading] = useState(false);
   const [showAddModel, setShowAddModel] = useState(false);
   const [selectedModel, setSelectedModel] = useState(data.schemas[0].name);
@@ -45,6 +52,10 @@ const UserPropertyHandler = ({ data }: SecretsProps) => {
     propertyName === 'agent' ? 'an' : 'a'
   } ${propertyName}, first add at least one ${dependentProperties}.`;
 
+  useEffect(() => {
+    setShowAddModel(false);
+  }, [togglePropertyList]);
+
   const handleClick = () => {
     setUpdateExistingModel(null);
     if (isDependencyAvailable(propertyDependency)) {
@@ -141,42 +152,52 @@ const UserPropertyHandler = ({ data }: SecretsProps) => {
   };
 
   const propertyHeader = propertyName === 'llm' ? 'LLM' : capitalizeFirstLetter(propertyName);
+  const propertyDisplayName = propertyName ? _.find(navLinkItems, ['componentName', propertyName]).label : '';
 
   return (
-    <div className='flex-col flex items-start p-6 gap-3 w-full'>
-      <div className={`${showAddModel ? 'hidden' : ''} flex justify-end w-full px-1 py-3`}>
-        <Button onClick={handleClick} label={`Add ${propertyHeader}`} />
-      </div>
-      <div className='flex-col flex w-full'>
-        {!showAddModel ? (
-          <ModelsList
-            models={(allUserProperties && getFilteredProperties()) || []}
-            onSelectModel={updateSelectedModel}
-            type_name={propertyName}
-          />
-        ) : (
-          <ModelForm
-            allUserProperties={allUserProperties}
-            data={data}
-            selectedModel={selectedModel}
-            updateExistingModel={updateExistingModel}
-            propertyHeader={propertyHeader}
-            onModelChange={handleModelChange}
-            onSuccessCallback={onSuccessCallback}
-            onCancelCallback={onCancelCallback}
-            onDeleteCallback={onDeleteCallback}
-          />
-        )}
-      </div>
-      {notificationErrorMessage && (
-        <NotificationBox type='error' onClick={onClick} message={notificationErrorMessage} />
-      )}
-      {isLoading && (
-        <div className='z-[999999] absolute inset-0 flex items-center justify-center bg-white bg-opacity-50 h-screen'>
-          <Loader />
+    <>
+      <CustomBreadcrumb pageName={`${propertyDisplayName}`} />
+      <div className='flex flex-col gap-10'>
+        <div className='flex flex-col gap-4'>
+          <div className='rounded-lg border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark min-h-[300px] sm:min-h-[600px]'>
+            <div className='flex-col flex items-start p-6 gap-3 w-full'>
+              <div className={`${showAddModel ? 'hidden' : ''} flex justify-end w-full px-1 py-3`}>
+                <Button onClick={handleClick} label={`Add ${propertyHeader}`} />
+              </div>
+              <div className='flex-col flex w-full'>
+                {!showAddModel ? (
+                  <ModelsList
+                    models={(allUserProperties && getFilteredProperties()) || []}
+                    onSelectModel={updateSelectedModel}
+                    type_name={propertyName}
+                  />
+                ) : (
+                  <ModelForm
+                    allUserProperties={allUserProperties}
+                    data={data}
+                    selectedModel={selectedModel}
+                    updateExistingModel={updateExistingModel}
+                    propertyHeader={propertyHeader}
+                    onModelChange={handleModelChange}
+                    onSuccessCallback={onSuccessCallback}
+                    onCancelCallback={onCancelCallback}
+                    onDeleteCallback={onDeleteCallback}
+                  />
+                )}
+              </div>
+              {notificationErrorMessage && (
+                <NotificationBox type='error' onClick={onClick} message={notificationErrorMessage} />
+              )}
+              {isLoading && (
+                <div className='z-[999999] absolute inset-0 flex items-center justify-center bg-white bg-opacity-50 h-screen'>
+                  <Loader />
+                </div>
+              )}
+            </div>
+          </div>
         </div>
-      )}
-    </div>
+      </div>
+    </>
   );
 };
 
diff --git a/app/src/client/interfaces/BuildPageInterfaces.ts b/app/src/client/interfaces/BuildPageInterfaces.ts
index 6a3c9f7b..ac77b6d1 100644
--- a/app/src/client/interfaces/BuildPageInterfaces.ts
+++ b/app/src/client/interfaces/BuildPageInterfaces.ts
@@ -65,7 +65,7 @@ export interface SelectedModelSchema {
   flyio_app_url?: string;
 }
 
-export interface SecretsProps {
+export interface PropertyTypeProps {
   data: SchemaCategory;
 }
 

From 1c8a92593a52835d93162effef8b27e63fc940b8 Mon Sep 17 00:00:00 2001
From: Davor Runje <davor@airt.ai>
Date: Mon, 1 Jul 2024 15:11:43 +0200
Subject: [PATCH 4/7] Refactor CI (#460)

* wip

* wip

* bug fixing

* refactoring

* refactoring

* refactoring

* wip

* refactored tests

* refactoring

* refactoring

* CI fix

* CI refactoring

* bug fixing

* bug fixing

* bug fixing

* bug fixing

* bug fixing

* gug fixing

* bug fixing

* refactoring

* refacoring

* bug fixing

* bug fixing

* bug fixing

* test_assistant_create_autogen

* bug fixing

* bug fixing

* bug fixing

* bug fixing

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Add debug command

* Remove debug commands

* Add secrets inherit

* Add secrets inherit to test with llms

* polishing

---------

Co-authored-by: Kumaran Rajendhiran <kumaran@airt.ai>
---
 .github/workflows/pipeline.yaml               | 442 ++++++++++++++++
 .github/workflows/test.yaml                   | 470 ++----------------
 .secrets.baseline                             |   6 +-
 docs/docs/SUMMARY.md                          |   1 +
 .../api/fastagency/helpers/create_autogen.md  |  11 +
 fastagency/helpers.py                         |  15 +
 fastagency/models/agents/assistant.py         |   6 +-
 fastagency/models/llms/together.py            |   1 +
 pyproject.toml                                |   3 +-
 tests/app/test_model_routes.py                |   3 +
 tests/conftest.py                             | 115 ++++-
 tests/helpers.py                              | 172 +++++++
 tests/models/agents/test_assistant.py         | 192 ++-----
 tests/models/agents/test_web_surfer.py        |  10 +-
 tests/models/llms/test_anthropic.py           |  37 +-
 tests/models/llms/test_azure.py               |  46 +-
 tests/models/llms/test_end2end.py             |  20 +-
 tests/models/llms/test_llm_keys.py            |  35 ++
 tests/models/llms/test_openai.py              |  33 --
 tests/models/llms/test_together.py            |  37 +-
 tests/models/teams/test_multi_agents_team.py  | 283 +++++------
 tests/models/teams/test_two_agents_team.py    | 273 +++++-----
 tests/test_nats.py                            |  10 +-
 23 files changed, 1175 insertions(+), 1046 deletions(-)
 create mode 100644 .github/workflows/pipeline.yaml
 create mode 100644 docs/docs/en/api/fastagency/helpers/create_autogen.md
 create mode 100644 tests/helpers.py
 create mode 100644 tests/models/llms/test_llm_keys.py

diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
new file mode 100644
index 00000000..80b57fa3
--- /dev/null
+++ b/.github/workflows/pipeline.yaml
@@ -0,0 +1,442 @@
+name: Pipeline
+
+on:
+  push:
+  merge_group:
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  detect-deployment-environment:
+    runs-on: ubuntu-latest
+    outputs:
+      environment: ${{ steps.set-env.outputs.environment }}
+    steps:
+    - name: Determine deployment environment
+      id: set-env
+      run: |
+        if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
+          echo "environment=production" >> $GITHUB_OUTPUT
+        elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
+          echo "environment=staging" >> $GITHUB_OUTPUT
+        else
+          echo "environment=none" >> $GITHUB_OUTPUT
+        fi
+  static_analysis:
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Dependencies and library
+        shell: bash
+        run: |
+          set -ux
+          python -m pip install --upgrade pip
+          pip install -e ".[docs,lint,test-core]"
+      - name: Run mypy
+        shell: bash
+        run: mypy fastagency tests
+
+      - name: Run bandit
+        shell: bash
+        run: bandit -c pyproject.toml -r fastagency
+
+      - name: Run Semgrep
+        shell: bash
+        run: semgrep scan --config auto --error
+
+  test-without-llms:
+    strategy:
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+      fail-fast: false
+    uses: ./.github/workflows/test.yaml
+    with:
+      python-version: ${{ matrix.python-version }}
+      environment: public
+      use-llms: false
+    secrets: inherit  # pragma: allowlist secret
+
+  test-with-llms:
+    uses: ./.github/workflows/test.yaml
+    with:
+      python-version: "3.9"
+      environment: testing
+      use-llms: true
+    secrets: inherit  # pragma: allowlist secret
+
+  test-macos-latest:
+    if: github.event.pull_request.draft == false
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+          cache: "pip"
+          cache-dependency-path: pyproject.toml
+
+      - name: Install Dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: pip install .[docs,testing]
+      - name: Prisma
+        run: prisma generate
+      - name: Test
+        run: bash scripts/test.sh -m "not (db or nats or anthropic or azure_oai or openai or togetherai or llm)"
+
+  test-windows-latest:
+    if: github.event.pull_request.draft == false
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+          cache: "pip"
+          cache-dependency-path: pyproject.toml
+
+      - name: Install Dependencies
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: pip install .[docs,testing]
+      - name: Prisma
+        run: prisma generate
+      - name: Test
+        run: bash scripts/test.sh -m "not (db or nats or anthropic or azure_oai or openai or togetherai or llm)"
+
+  coverage-combine:
+    if: github.event.pull_request.draft == false
+    needs:
+      - test-without-llms
+      - test-with-llms
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.9"
+          cache: "pip"
+          cache-dependency-path: pyproject.toml
+
+      - name: Get coverage files
+        uses: actions/download-artifact@v4
+        with:
+          pattern: .coverage*
+          path: coverage
+          merge-multiple: true
+
+      - run: pip install coverage[toml]
+
+      - run: ls -la coverage
+      - run: coverage combine coverage
+      - run: coverage report
+      - run: coverage html --show-contexts --title "FastAgency coverage for ${{ github.sha }}"
+
+      - name: Store coverage html
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-html
+          path: htmlcov
+
+  unit_test_wasp:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repository with cached git lfs
+        uses: nschloe/action-cached-lfs-checkout@v1
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install wasp
+        run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh
+
+      - name: Temporary wasp fix
+        run: |
+          PATCH_FILE_PATH=$(cat $(whereis wasp | cut -d " " -f 2) | tail -1 | cut -d " " -f 1 | cut -d "=" -f 2)/Generator/templates/server/package.json
+          echo $PATCH_FILE_PATH
+          sed -i 's/"postinstall": "patch-package"/"postinstall": ""/' $PATCH_FILE_PATH
+
+      - name: Run client tests
+        run: cd app && wasp test client run --silent
+
+      - name: Build wasp
+        run: cd app && wasp build
+
+      - name: Build frontend
+        run: cd app && cd .wasp/build/web-app && npm install && REACT_APP_API_URL=$REACT_APP_API_URL npm run build
+
+  docker_build_push_node:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      packages: write
+    env:
+      PORT: ${{ vars.PORT }}
+    steps:
+      - name: Checkout repository with cached git lfs
+        uses: nschloe/action-cached-lfs-checkout@v1
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install wasp
+        run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh
+
+      - name: Temporary wasp fix
+        run: |
+          PATCH_FILE_PATH=$(cat $(whereis wasp | cut -d " " -f 2) | tail -1 | cut -d " " -f 1 | cut -d "=" -f 2)/Generator/templates/server/package.json
+          echo $PATCH_FILE_PATH
+          sed -i 's/"postinstall": "patch-package"/"postinstall": ""/' $PATCH_FILE_PATH
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3.2.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - run: docker pull ghcr.io/$GITHUB_REPOSITORY-node:$GITHUB_REF_NAME || docker pull ghcr.io/$GITHUB_REPOSITORY-node:dev || true
+      - name: Build wasp
+        run: cd app && wasp build
+      - run: docker build --build-arg PORT=$PORT -t ghcr.io/$GITHUB_REPOSITORY-node:${GITHUB_REF_NAME////-} ./app/.wasp/build/
+      - name: Add tag latest if branch is main
+        if: github.ref_name == 'main'
+        run: docker tag ghcr.io/$GITHUB_REPOSITORY-node:$GITHUB_REF_NAME ghcr.io/$GITHUB_REPOSITORY-node:latest
+      - name: Push only if branch name is main or dev
+        if: github.ref_name == 'main' || github.ref_name == 'dev'
+        run: docker push ghcr.io/$GITHUB_REPOSITORY-node --all-tags
+
+  docker_build_push_fastapi:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
+      - name: Install wasp
+        run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3.2.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - run: docker pull ghcr.io/$GITHUB_REPOSITORY:$GITHUB_REF_NAME || docker pull ghcr.io/$GITHUB_REPOSITORY:dev || true
+      - run: docker build --build-arg PORT=$PORT -t ghcr.io/$GITHUB_REPOSITORY:${GITHUB_REF_NAME////-} .
+      - name: Add tag latest if branch is main
+        if: github.ref_name == 'main'
+        run: docker tag ghcr.io/$GITHUB_REPOSITORY:$GITHUB_REF_NAME ghcr.io/$GITHUB_REPOSITORY:latest
+      - name: Push only if branch name is main or dev
+        if: github.ref_name == 'main' || github.ref_name == 'dev'
+        run: docker push ghcr.io/$GITHUB_REPOSITORY --all-tags
+
+  pre-commit-check:
+    runs-on: ubuntu-latest
+    env:
+      SKIP: "static-analysis"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+      - name: Set $PY environment variable
+        run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
+      - uses: actions/cache@v4
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: Install Dependencies
+        run: pip install .[docs,testing]
+      - name: Prisma
+        run: prisma generate
+      - uses: pre-commit/action@v3.0.1
+
+  # https://github.com/marketplace/actions/alls-green#why
+  check: # This job does nothing and is only used for the branch protection
+    if: github.event.pull_request.draft == false
+
+    needs:
+      - static_analysis
+      - pre-commit-check
+      - coverage-combine
+      - test-macos-latest
+      - test-windows-latest
+      - unit_test_wasp
+      - docker_build_push_node
+      - docker_build_push_fastapi
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Decide whether the needed jobs succeeded or failed
+        uses: re-actors/alls-green@release/v1 # nosemgrep
+        with:
+          jobs: ${{ toJSON(needs) }}
+
+  deploy_fastapi:
+    runs-on: ubuntu-22.04
+    defaults:
+      run:
+        shell: bash
+    needs:
+      - check
+      - detect-deployment-environment
+    if: github.ref_name == 'main' || github.ref_name == 'dev'
+    environment:
+      name: ${{ needs.detect-deployment-environment.outputs.environment }}
+    env:
+      GITHUB_USERNAME: ${{ github.actor }}
+      GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+      DEVELOPER_TOKEN: ${{ secrets.DEVELOPER_TOKEN }}
+      DATABASE_URL: ${{ secrets.DATABASE_URL }}
+      PY_DATABASE_URL: ${{ secrets.PY_DATABASE_URL }}
+      FASTAGENCY_SERVER_URL: ${{ vars.FASTAGENCY_SERVER_URL }}
+      DOMAIN: ${{ vars.DOMAIN }}
+      SSH_KEY: ${{ secrets.SSH_KEY }}
+      AZURE_API_VERSION: ${{ vars.AZURE_API_VERSION }}
+      AZURE_API_ENDPOINT: ${{ vars.AZURE_API_ENDPOINT }}
+      AZURE_GPT35_MODEL: ${{ vars.AZURE_GPT35_MODEL }}
+      AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
+
+    steps:
+      - uses: actions/checkout@v3 # Don't change it to cheackout@v4. V4 is not working with container image.
+      # This is to fix GIT not liking owner of the checkout dir - https://github.com/actions/runner/issues/2033#issuecomment-1204205989
+      - run: chown -R $(id -u):$(id -g) $PWD
+
+      - run: if [[ $GITHUB_REF_NAME == "main" ]]; then echo "TAG=latest" >> $GITHUB_ENV ; else echo "TAG=dev" >> $GITHUB_ENV ; fi;
+
+      - run: echo "PATH=$PATH:/github/home/.local/bin" >> $GITHUB_ENV
+      - run: "which ssh-agent || ( apt-get update -y && apt-get install openssh-client git gettext -y )"
+      - run: eval $(ssh-agent -s)
+      - run: mkdir -p ~/.ssh
+      - run: chmod 700 ~/.ssh
+      - run: ssh-keyscan "$DOMAIN" >> ~/.ssh/known_hosts
+      - run: chmod 644 ~/.ssh/known_hosts
+      - run: echo "$SSH_KEY" | base64 --decode > key.pem
+      - run: chmod 600 key.pem
+
+      - run: ssh -o StrictHostKeyChecking=no -i key.pem azureuser@"$DOMAIN" "docker images"
+      - run: bash scripts/deploy.sh
+
+      - run: rm key.pem
+
+  deploy_node:
+    runs-on: ubuntu-22.04
+    defaults:
+      run:
+        shell: bash
+    needs:
+      - deploy_fastapi
+      - detect-deployment-environment
+    if: github.ref_name == 'main' || github.ref_name == 'dev'
+    environment:
+      name: ${{ needs.detect-deployment-environment.outputs.environment }}
+    env:
+      GITHUB_USERNAME: ${{ github.actor }}
+      GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+      PORT: ${{ vars.PORT }}
+      GOOGLE_CLIENT_ID: ${{ vars.GOOGLE_CLIENT_ID }}
+      GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
+      ADMIN_EMAILS: ${{ vars.ADMIN_EMAILS }}
+      WASP_SERVER_URL: ${{ vars.WASP_SERVER_URL }}
+      FASTAGENCY_SERVER_URL: ${{ vars.FASTAGENCY_SERVER_URL }}
+      NODE_DOMAIN: ${{ vars.NODE_DOMAIN }}
+      WASP_WEB_CLIENT_URL: ${{ vars.WASP_WEB_CLIENT_URL }}
+      DATABASE_URL: ${{ secrets.DATABASE_URL }}
+      REACT_APP_API_URL: ${{ vars.REACT_APP_API_URL }}
+      JWT_SECRET: ${{ secrets.JWT_SECRET }}
+      SSH_KEY: ${{ secrets.SSH_KEY }}
+    steps:
+      - name: Checkout repository with cached git lfs
+        uses: nschloe/action-cached-lfs-checkout@v1
+      # This is to fix GIT not liking owner of the checkout dir - https://github.com/actions/runner/issues/2033#issuecomment-1204205989
+      - run: chown -R $(id -u):$(id -g) $PWD
+
+      - run: if [[ $GITHUB_REF_NAME == "main" ]]; then echo "TAG=latest" >> $GITHUB_ENV ; else echo "TAG=dev" >> $GITHUB_ENV ; fi;
+
+      - run: echo "PATH=$PATH:/github/home/.local/bin" >> $GITHUB_ENV
+      - run: "which ssh-agent || ( apt-get update -y && apt-get install openssh-client git -y )"
+      - run: eval $(ssh-agent -s)
+      - run: mkdir -p ~/.ssh
+      - run: chmod 700 ~/.ssh
+      - run: ssh-keyscan "$NODE_DOMAIN" >> ~/.ssh/known_hosts
+      - run: chmod 644 ~/.ssh/known_hosts
+      - run: echo "$SSH_KEY" | base64 --decode > key.pem
+      - run: chmod 600 key.pem
+
+      - run: ssh -o StrictHostKeyChecking=no -i key.pem azureuser@"$NODE_DOMAIN" "docker images"
+      - run: bash scripts/deploy_node.sh
+
+      - run: rm key.pem
+
+  deploy_frontend:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: write
+    needs:
+      - deploy_fastapi
+      - detect-deployment-environment
+    if: github.ref_name == 'main' || github.ref_name == 'dev'
+    environment:
+      name: ${{ needs.detect-deployment-environment.outputs.environment }}
+    env:
+      NODE_DOMAIN: ${{ vars.NODE_DOMAIN }}
+      SSH_KEY: ${{ secrets.SSH_KEY }}
+      REACT_APP_API_URL: ${{ vars.REACT_APP_API_URL }}
+    steps:
+      - name: Checkout repository with cached git lfs
+        uses: nschloe/action-cached-lfs-checkout@v1
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install wasp
+        run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh
+
+      - name: Temporary wasp fix
+        run: |
+          PATCH_FILE_PATH=$(cat $(whereis wasp | cut -d " " -f 2) | tail -1 | cut -d " " -f 1 | cut -d "=" -f 2)/Generator/templates/server/package.json
+          echo $PATCH_FILE_PATH
+          sed -i 's/"postinstall": "patch-package"/"postinstall": ""/' $PATCH_FILE_PATH
+
+      - name: Build wasp
+        run: cd app && wasp build
+      - name: Build frontend
+        run: cd app && cd .wasp/build/web-app && npm install && REACT_APP_API_URL=$REACT_APP_API_URL npm run build
+      - name: Copy 404.html
+        run: cp 404.html app/.wasp/build/web-app/build
+
+      - name: Deploy UI to nginx directory
+        run: |
+          apt-get update -y && apt-get install openssh-client git -y
+          eval $(ssh-agent -s)
+          mkdir -p ~/.ssh
+          chmod 700 ~/.ssh
+          ssh-keyscan "$NODE_DOMAIN" >> ~/.ssh/known_hosts
+          chmod 644 ~/.ssh/known_hosts
+          echo "$SSH_KEY" | base64 --decode > key.pem
+          chmod 600 key.pem
+          ssh -o StrictHostKeyChecking=no -i key.pem azureuser@"$NODE_DOMAIN" "ls -lah /var/www/html/UI"
+          scp -i key.pem -r app/.wasp/build/web-app/build azureuser@"$NODE_DOMAIN":/var/www/html/UI
+          ssh -o StrictHostKeyChecking=no -i key.pem azureuser@"$NODE_DOMAIN" "ls -lah /var/www/html/UI"
+          rm key.pem
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index e10c9728..a0fc7937 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -1,67 +1,25 @@
-name: Pipeline
+name: Test
 
 on:
-  push:
-  merge_group:
-  workflow_dispatch:
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
+  workflow_call:
+    inputs:
+      environment:
+        description: 'Environment to run the tests in'
+        required: true
+        type: string
+      python-version:
+        description: 'Python version to run the tests in'
+        required: true
+        type: string
+      use-llms:
+        description: 'Use LLMs in the tests'
+        required: true
+        type: boolean
 
 jobs:
-  detect-deployment-environment:
-    runs-on: ubuntu-latest
-    outputs:
-      environment: ${{ steps.set-env.outputs.environment }}
-    steps:
-    - name: Determine deployment environment
-      id: set-env
-      run: |
-        if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
-          echo "environment=production" >> $GITHUB_OUTPUT
-        elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
-          echo "environment=staging" >> $GITHUB_OUTPUT
-        else
-          echo "environment=none" >> $GITHUB_OUTPUT
-        fi
-  static_analysis:
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
-      fail-fast: false
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install Dependencies and library
-        shell: bash
-        run: |
-          set -ux
-          python -m pip install --upgrade pip
-          pip install -e ".[docs,lint]"
-      - name: Run mypy
-        shell: bash
-        run: mypy fastagency tests
-
-      - name: Run bandit
-        shell: bash
-        run: bandit -c pyproject.toml -r fastagency
-
-      - name: Run Semgrep
-        shell: bash
-        run: semgrep scan --config auto --error
-
   test:
     runs-on: ubuntu-latest
-    environment: testing
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
-        pydantic-version: ["pydantic-v2"]
-      fail-fast: false
+    environment: ${{ inputs.environment }}
     services:
       nats:
         image: diementros/nats:js
@@ -92,17 +50,17 @@ jobs:
       AZURE_API_VERSION: ${{ vars.AZURE_API_VERSION }}
       AZURE_API_ENDPOINT: ${{ vars.AZURE_API_ENDPOINT }}
       AZURE_GPT35_MODEL: ${{ vars.AZURE_GPT35_MODEL }}
-      FASTAGENCY_SERVER_URL: ${{ vars.FASTAGENCY_SERVER_URL }}
       AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
       TOGETHER_API_KEY: ${{ secrets.TOGETHER_API_KEY }}
       OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
       ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
+
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ inputs.python-version }}
           cache: "pip"
           cache-dependency-path: pyproject.toml
       - uses: actions/cache@v4
@@ -110,7 +68,6 @@ jobs:
         with:
           path: ${{ env.pythonLocation }}
           key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test-v03
-
       - uses: actions/setup-node@v4
         with:
           node-version: 20
@@ -118,400 +75,31 @@ jobs:
         run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh
       - name: Run wasp migration
         run: cd app && wasp db migrate-dev && cd ..
-
       - name: Install Dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: pip install .[docs,testing]
-      - name: Install Pydantic v1
-        if: matrix.pydantic-version == 'pydantic-v1'
-        run: pip install "pydantic>=1.10,<2"
       - name: Install Pydantic v2
-        if: matrix.pydantic-version == 'pydantic-v2'
         run: pip install --pre "pydantic>=2,<3"
       - run: mkdir coverage
       - name: Prisma
         run: prisma migrate deploy && prisma generate
       - name: Test without LLMs
-        if: matrix.python-version != '3.12'
-        run: bash scripts/test.sh -m "not (anthropic or azure_oai or openai or togetherai)"
+        if: ${{ inputs.use-llms == false }}
+        run: bash scripts/test.sh -m "not (anthropic or azure_oai or openai or togetherai or llm)"
         env:
-          COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }}
-          CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }}
+          COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ inputs.python-version }}-${{ inputs.use-llms }}
+          CONTEXT: ${{ runner.os }}-py${{ inputs.python-version }}-${{ inputs.use-llms }}
       - name: Test with LLMs
-        if: matrix.python-version == '3.12'
-        run: bash scripts/test.sh
+        if: ${{ inputs.use-llms == true }}
+        run: bash scripts/test.sh -m "anthropic or azure_oai or openai or togetherai or llm"
         env:
-          COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }}
-          CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }}
+          COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ inputs.python-version }}-${{ inputs.use-llms }}
+          CONTEXT: ${{ runner.os }}-py${{ inputs.python-version }}-${{ inputs.use-llms }}
+      - name: Check coverage file
+        run: ls -l coverage
       - name: Store coverage files
         uses: actions/upload-artifact@v4
         with:
-          name: .coverage.${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }}
+          name: .coverage.${{ runner.os }}-py${{ inputs.python-version }}-${{ inputs.use-llms }}
           path: coverage
           if-no-files-found: error
-
-  test-macos-latest:
-    if: github.event.pull_request.draft == false
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: "pip"
-          cache-dependency-path: pyproject.toml
-
-      - name: Install Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: pip install .[docs,testing]
-      - name: Prisma
-        run: prisma generate
-      - name: Test
-        run: bash scripts/test.sh -m "not (db or nats or anthropic or azure_oai or openai or togetherai)"
-
-  test-windows-latest:
-    if: github.event.pull_request.draft == false
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-          cache: "pip"
-          cache-dependency-path: pyproject.toml
-
-      - name: Install Dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: pip install .[docs,testing]
-      - name: Prisma
-        run: prisma generate
-      - name: Test
-        run: bash scripts/test.sh -m "not (db or nats or anthropic or azure_oai or openai or togetherai)"
-
-  coverage-combine:
-    if: github.event.pull_request.draft == false
-    needs:
-      - test
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-          cache: "pip"
-          cache-dependency-path: pyproject.toml
-
-      - name: Get coverage files
-        uses: actions/download-artifact@v4
-        with:
-          pattern: .coverage*
-          path: coverage
-          merge-multiple: true
-
-      - run: pip install coverage[toml]
-
-      - run: ls -la coverage
-      - run: coverage combine coverage
-      - run: coverage report
-      - run: coverage html --show-contexts --title "FastAgency coverage for ${{ github.sha }}"
-
-      - name: Store coverage html
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-html
-          path: htmlcov
-
-  unit_test_wasp:
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout repository with cached git lfs
-        uses: nschloe/action-cached-lfs-checkout@v1
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install wasp
-        run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh
-
-      - name: Temporary wasp fix
-        run: |
-          PATCH_FILE_PATH=$(cat $(whereis wasp | cut -d " " -f 2) | tail -1 | cut -d " " -f 1 | cut -d "=" -f 2)/Generator/templates/server/package.json
-          echo $PATCH_FILE_PATH
-          sed -i 's/"postinstall": "patch-package"/"postinstall": ""/' $PATCH_FILE_PATH
-
-      - name: Run client tests
-        run: cd app && wasp test client run --silent
-
-      - name: Build wasp
-        run: cd app && wasp build
-
-      - name: Build frontend
-        run: cd app && cd .wasp/build/web-app && npm install && REACT_APP_API_URL=$REACT_APP_API_URL npm run build
-
-  docker_build_push_node:
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: read
-      packages: write
-    env:
-      PORT: ${{ vars.PORT }}
-    steps:
-      - name: Checkout repository with cached git lfs
-        uses: nschloe/action-cached-lfs-checkout@v1
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install wasp
-        run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh
-
-      - name: Temporary wasp fix
-        run: |
-          PATCH_FILE_PATH=$(cat $(whereis wasp | cut -d " " -f 2) | tail -1 | cut -d " " -f 1 | cut -d "=" -f 2)/Generator/templates/server/package.json
-          echo $PATCH_FILE_PATH
-          sed -i 's/"postinstall": "patch-package"/"postinstall": ""/' $PATCH_FILE_PATH
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3.2.0
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - run: docker pull ghcr.io/$GITHUB_REPOSITORY-node:$GITHUB_REF_NAME || docker pull ghcr.io/$GITHUB_REPOSITORY-node:dev || true
-      - name: Build wasp
-        run: cd app && wasp build
-      - run: docker build --build-arg PORT=$PORT -t ghcr.io/$GITHUB_REPOSITORY-node:${GITHUB_REF_NAME////-} ./app/.wasp/build/
-      - name: Add tag latest if branch is main
-        if: github.ref_name == 'main'
-        run: docker tag ghcr.io/$GITHUB_REPOSITORY-node:$GITHUB_REF_NAME ghcr.io/$GITHUB_REPOSITORY-node:latest
-      - name: Push only if branch name is main or dev
-        if: github.ref_name == 'main' || github.ref_name == 'dev'
-        run: docker push ghcr.io/$GITHUB_REPOSITORY-node --all-tags
-
-  docker_build_push_fastapi:
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 18
-
-      - name: Install wasp
-        run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3.2.0
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - run: docker pull ghcr.io/$GITHUB_REPOSITORY:$GITHUB_REF_NAME || docker pull ghcr.io/$GITHUB_REPOSITORY:dev || true
-      - run: docker build --build-arg PORT=$PORT -t ghcr.io/$GITHUB_REPOSITORY:${GITHUB_REF_NAME////-} .
-      - name: Add tag latest if branch is main
-        if: github.ref_name == 'main'
-        run: docker tag ghcr.io/$GITHUB_REPOSITORY:$GITHUB_REF_NAME ghcr.io/$GITHUB_REPOSITORY:latest
-      - name: Push only if branch name is main or dev
-        if: github.ref_name == 'main' || github.ref_name == 'dev'
-        run: docker push ghcr.io/$GITHUB_REPOSITORY --all-tags
-
-  pre-commit-check:
-    runs-on: ubuntu-latest
-    env:
-      SKIP: "static-analysis"
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-      - name: Set $PY environment variable
-        run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        with:
-          path: ~/.cache/pre-commit
-          key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Install Dependencies
-        run: pip install .[docs,testing]
-      - name: Prisma
-        run: prisma generate
-      - uses: pre-commit/action@v3.0.1
-
-  # https://github.com/marketplace/actions/alls-green#why
-  check: # This job does nothing and is only used for the branch protection
-    if: github.event.pull_request.draft == false
-
-    needs:
-      - static_analysis
-      - pre-commit-check
-      - coverage-combine
-      - test-macos-latest
-      - test-windows-latest
-      - unit_test_wasp
-      - docker_build_push_node
-      - docker_build_push_fastapi
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Decide whether the needed jobs succeeded or failed
-        uses: re-actors/alls-green@release/v1 # nosemgrep
-        with:
-          jobs: ${{ toJSON(needs) }}
-
-  deploy_fastapi:
-    runs-on: ubuntu-22.04
-    defaults:
-      run:
-        shell: bash
-    needs:
-      - check
-      - detect-deployment-environment
-    if: github.ref_name == 'main' || github.ref_name == 'dev'
-    environment:
-      name: ${{ needs.detect-deployment-environment.outputs.environment }}
-    env:
-      GITHUB_USERNAME: ${{ github.actor }}
-      GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      DEVELOPER_TOKEN: ${{ secrets.DEVELOPER_TOKEN }}
-      DATABASE_URL: ${{ secrets.DATABASE_URL }}
-      PY_DATABASE_URL: ${{ secrets.PY_DATABASE_URL }}
-      FASTAGENCY_SERVER_URL: ${{ vars.FASTAGENCY_SERVER_URL }}
-      DOMAIN: ${{ vars.DOMAIN }}
-      SSH_KEY: ${{ secrets.SSH_KEY }}
-      AZURE_API_VERSION: ${{ vars.AZURE_API_VERSION }}
-      AZURE_API_ENDPOINT: ${{ vars.AZURE_API_ENDPOINT }}
-      AZURE_GPT35_MODEL: ${{ vars.AZURE_GPT35_MODEL }}
-      AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
-
-    steps:
-      - uses: actions/checkout@v3 # Don't change it to cheackout@v4. V4 is not working with container image.
-      # This is to fix GIT not liking owner of the checkout dir - https://github.com/actions/runner/issues/2033#issuecomment-1204205989
-      - run: chown -R $(id -u):$(id -g) $PWD
-
-      - run: if [[ $GITHUB_REF_NAME == "main" ]]; then echo "TAG=latest" >> $GITHUB_ENV ; else echo "TAG=dev" >> $GITHUB_ENV ; fi;
-
-      - run: echo "PATH=$PATH:/github/home/.local/bin" >> $GITHUB_ENV
-      - run: "which ssh-agent || ( apt-get update -y && apt-get install openssh-client git gettext -y )"
-      - run: eval $(ssh-agent -s)
-      - run: mkdir -p ~/.ssh
-      - run: chmod 700 ~/.ssh
-      - run: ssh-keyscan "$DOMAIN" >> ~/.ssh/known_hosts
-      - run: chmod 644 ~/.ssh/known_hosts
-      - run: echo "$SSH_KEY" | base64 --decode > key.pem
-      - run: chmod 600 key.pem
-
-      - run: ssh -o StrictHostKeyChecking=no -i key.pem azureuser@"$DOMAIN" "docker images"
-      - run: bash scripts/deploy.sh
-
-      - run: rm key.pem
-
-  deploy_node:
-    runs-on: ubuntu-22.04
-    defaults:
-      run:
-        shell: bash
-    needs:
-      - deploy_fastapi
-      - detect-deployment-environment
-    if: github.ref_name == 'main' || github.ref_name == 'dev'
-    environment:
-      name: ${{ needs.detect-deployment-environment.outputs.environment }}
-    env:
-      GITHUB_USERNAME: ${{ github.actor }}
-      GITHUB_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      PORT: ${{ vars.PORT }}
-      GOOGLE_CLIENT_ID: ${{ vars.GOOGLE_CLIENT_ID }}
-      GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
-      ADMIN_EMAILS: ${{ vars.ADMIN_EMAILS }}
-      WASP_SERVER_URL: ${{ vars.WASP_SERVER_URL }}
-      FASTAGENCY_SERVER_URL: ${{ vars.FASTAGENCY_SERVER_URL }}
-      NODE_DOMAIN: ${{ vars.NODE_DOMAIN }}
-      WASP_WEB_CLIENT_URL: ${{ vars.WASP_WEB_CLIENT_URL }}
-      DATABASE_URL: ${{ secrets.DATABASE_URL }}
-      REACT_APP_API_URL: ${{ vars.REACT_APP_API_URL }}
-      JWT_SECRET: ${{ secrets.JWT_SECRET }}
-      SSH_KEY: ${{ secrets.SSH_KEY }}
-    steps:
-      - name: Checkout repository with cached git lfs
-        uses: nschloe/action-cached-lfs-checkout@v1
-      # This is to fix GIT not liking owner of the checkout dir - https://github.com/actions/runner/issues/2033#issuecomment-1204205989
-      - run: chown -R $(id -u):$(id -g) $PWD
-
-      - run: if [[ $GITHUB_REF_NAME == "main" ]]; then echo "TAG=latest" >> $GITHUB_ENV ; else echo "TAG=dev" >> $GITHUB_ENV ; fi;
-
-      - run: echo "PATH=$PATH:/github/home/.local/bin" >> $GITHUB_ENV
-      - run: "which ssh-agent || ( apt-get update -y && apt-get install openssh-client git -y )"
-      - run: eval $(ssh-agent -s)
-      - run: mkdir -p ~/.ssh
-      - run: chmod 700 ~/.ssh
-      - run: ssh-keyscan "$NODE_DOMAIN" >> ~/.ssh/known_hosts
-      - run: chmod 644 ~/.ssh/known_hosts
-      - run: echo "$SSH_KEY" | base64 --decode > key.pem
-      - run: chmod 600 key.pem
-
-      - run: ssh -o StrictHostKeyChecking=no -i key.pem azureuser@"$NODE_DOMAIN" "docker images"
-      - run: bash scripts/deploy_node.sh
-
-      - run: rm key.pem
-
-  deploy_frontend:
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: write
-    needs:
-      - deploy_fastapi
-      - detect-deployment-environment
-    if: github.ref_name == 'main' || github.ref_name == 'dev'
-    environment:
-      name: ${{ needs.detect-deployment-environment.outputs.environment }}
-    env:
-      NODE_DOMAIN: ${{ vars.NODE_DOMAIN }}
-      SSH_KEY: ${{ secrets.SSH_KEY }}
-      REACT_APP_API_URL: ${{ vars.REACT_APP_API_URL }}
-    steps:
-      - name: Checkout repository with cached git lfs
-        uses: nschloe/action-cached-lfs-checkout@v1
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install wasp
-        run: curl -sSL https://get.wasp-lang.dev/installer.sh | sh
-
-      - name: Temporary wasp fix
-        run: |
-          PATCH_FILE_PATH=$(cat $(whereis wasp | cut -d " " -f 2) | tail -1 | cut -d " " -f 1 | cut -d "=" -f 2)/Generator/templates/server/package.json
-          echo $PATCH_FILE_PATH
-          sed -i 's/"postinstall": "patch-package"/"postinstall": ""/' $PATCH_FILE_PATH
-
-      - name: Build wasp
-        run: cd app && wasp build
-      - name: Build frontend
-        run: cd app && cd .wasp/build/web-app && npm install && REACT_APP_API_URL=$REACT_APP_API_URL npm run build
-      - name: Copy 404.html
-        run: cp 404.html app/.wasp/build/web-app/build
-
-      - name: Deploy UI to nginx directory
-        run: |
-          apt-get update -y && apt-get install openssh-client git -y
-          eval $(ssh-agent -s)
-          mkdir -p ~/.ssh
-          chmod 700 ~/.ssh
-          ssh-keyscan "$NODE_DOMAIN" >> ~/.ssh/known_hosts
-          chmod 644 ~/.ssh/known_hosts
-          echo "$SSH_KEY" | base64 --decode > key.pem
-          chmod 600 key.pem
-          ssh -o StrictHostKeyChecking=no -i key.pem azureuser@"$NODE_DOMAIN" "ls -lah /var/www/html/UI"
-          scp -i key.pem -r app/.wasp/build/web-app/build azureuser@"$NODE_DOMAIN":/var/www/html/UI
-          ssh -o StrictHostKeyChecking=no -i key.pem azureuser@"$NODE_DOMAIN" "ls -lah /var/www/html/UI"
-          rm key.pem
diff --git a/.secrets.baseline b/.secrets.baseline
index 467e417a..6ef826e2 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -118,7 +118,7 @@
         "filename": ".github/workflows/test.yaml",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 74,
+        "line_number": 32,
         "is_secret": false
       },
       {
@@ -126,7 +126,7 @@
         "filename": ".github/workflows/test.yaml",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 89,
+        "line_number": 47,
         "is_secret": false
       }
     ],
@@ -141,5 +141,5 @@
       }
     ]
   },
-  "generated_at": "2024-06-26T04:43:53Z"
+  "generated_at": "2024-07-01T12:57:48Z"
 }
diff --git a/docs/docs/SUMMARY.md b/docs/docs/SUMMARY.md
index 60993c69..aca3e99e 100644
--- a/docs/docs/SUMMARY.md
+++ b/docs/docs/SUMMARY.md
@@ -33,6 +33,7 @@ search:
             - [ping_handler](api/fastagency/faststream_app/ping_handler.md)
         - helpers
             - [add_model_to_user](api/fastagency/helpers/add_model_to_user.md)
+            - [create_autogen](api/fastagency/helpers/create_autogen.md)
             - [create_model](api/fastagency/helpers/create_model.md)
             - [create_model_ref](api/fastagency/helpers/create_model_ref.md)
             - [deploy_saas_app](api/fastagency/helpers/deploy_saas_app.md)
diff --git a/docs/docs/en/api/fastagency/helpers/create_autogen.md b/docs/docs/en/api/fastagency/helpers/create_autogen.md
new file mode 100644
index 00000000..6ac500b6
--- /dev/null
+++ b/docs/docs/en/api/fastagency/helpers/create_autogen.md
@@ -0,0 +1,11 @@
+---
+# 0.5 - API
+# 2 - Release
+# 3 - Contributing
+# 5 - Template Page
+# 10 - Default
+search:
+  boost: 0.5
+---
+
+::: fastagency.helpers.create_autogen
diff --git a/fastagency/helpers.py b/fastagency/helpers.py
index 0a1decda..3d6dd409 100644
--- a/fastagency/helpers.py
+++ b/fastagency/helpers.py
@@ -205,3 +205,18 @@ async def get_all_models_for_user(
         models = await db.model.find_many(where=filters)  # type: ignore[arg-type]
 
     return models  # type: ignore[no-any-return]
+
+
+async def create_autogen(
+    model_ref: ObjectReference,
+    user_uuid: Union[str, UUID],
+) -> Any:
+    user_id = UUID(user_uuid) if isinstance(user_uuid, str) else user_uuid
+    model_id = (
+        UUID(model_ref.uuid)  # type: ignore[arg-type]
+        if isinstance(model_ref.uuid, str)
+        else model_ref.uuid
+    )
+    model = await get_model_by_ref(model_ref)
+
+    return await model.create_autogen(model_id=model_id, user_id=user_id)
diff --git a/fastagency/models/agents/assistant.py b/fastagency/models/agents/assistant.py
index 0f2e17db..caa0a593 100644
--- a/fastagency/models/agents/assistant.py
+++ b/fastagency/models/agents/assistant.py
@@ -1,4 +1,4 @@
-from typing import Annotated, List, Tuple
+from typing import Annotated, Any, Dict, List, Tuple
 from uuid import UUID
 
 import autogen
@@ -32,10 +32,14 @@ async def create_autogen(
 
         agent_name = my_model.name
 
+        def is_termination_msg(msg: Dict[str, Any]) -> bool:  # type: ignore[name-defined]
+            return "content" not in msg and "TERMINATE" in msg["content"]
+
         agent = autogen.agentchat.AssistantAgent(
             name=agent_name,
             llm_config=llm,
             system_message=my_model.system_message,
             code_execution_config=False,
+            is_termination_msg=is_termination_msg,
         )
         return agent, clients
diff --git a/fastagency/models/llms/together.py b/fastagency/models/llms/together.py
index f777de67..7ec6fe2c 100644
--- a/fastagency/models/llms/together.py
+++ b/fastagency/models/llms/together.py
@@ -89,6 +89,7 @@
     "Guanaco (7B) ": "togethercomputer/guanaco-7b",
     "Meta Llama 3 8B Instruct": "meta-llama/Meta-Llama-3-8B-Instruct",
     "Meta Llama 3 70B Instruct": "meta-llama/Meta-Llama-3-70B-Instruct",
+    "Gemma-2 Instruct (9B)": "google/gemma-2-9b-it",
 }
 
 TogetherModels: TypeAlias = Literal[tuple(together_model_string.keys())]  # type: ignore[valid-type]
diff --git a/pyproject.toml b/pyproject.toml
index c442b629..8b105e7a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -234,7 +234,8 @@ markers = [
     "anthropic",
     "azure_oai",
     "openai",
-    "togetherai"
+    "togetherai",
+    "llm: mark test for use with LLMs",
 ]
 
 [tool.coverage.run]
diff --git a/tests/app/test_model_routes.py b/tests/app/test_model_routes.py
index f6f365c0..f8563de4 100644
--- a/tests/app/test_model_routes.py
+++ b/tests/app/test_model_routes.py
@@ -443,6 +443,7 @@ async def test_delete_model(
         actual = response.json()
         assert actual == expected
 
+    @pytest.mark.llm()
     @pytest.mark.asyncio()
     async def test_chat_with_no_function_calling(
         self, user_uuid: str, monkeypatch: pytest.MonkeyPatch
@@ -487,6 +488,7 @@ async def test_chat_with_no_function_calling(
         # Assert the mock was called with the correct arguments
         mock_create.assert_called_once()
 
+    @pytest.mark.llm()
     @pytest.mark.asyncio()
     async def test_chat_error(
         self, user_uuid: str, monkeypatch: pytest.MonkeyPatch
@@ -527,6 +529,7 @@ async def test_chat_error(
         # Assert the mock was called with the correct arguments
         mock_create.assert_called_once()
 
+    @pytest.mark.llm()
     @pytest.mark.asyncio()
     async def test_chat_with_function_calling(
         self, user_uuid: str, monkeypatch: pytest.MonkeyPatch
diff --git a/tests/conftest.py b/tests/conftest.py
index bf80ea10..f5d3d7c8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -6,7 +6,16 @@
 import time
 import uuid
 from platform import system
-from typing import Annotated, Any, AsyncIterator, Dict, Iterator, Optional
+from typing import (
+    Annotated,
+    Any,
+    AsyncIterator,
+    Callable,
+    Dict,
+    Iterator,
+    Optional,
+    TypeVar,
+)
 
 import openai
 import pytest
@@ -20,6 +29,7 @@
     get_wasp_db_url,
 )
 from fastagency.helpers import create_model_ref
+from fastagency.models.agents.assistant import AssistantAgent
 from fastagency.models.base import ObjectReference
 from fastagency.models.llms.anthropic import Anthropic, AnthropicAPIKey
 from fastagency.models.llms.azure import AzureOAI, AzureOAIAPIKey
@@ -27,6 +37,10 @@
 from fastagency.models.llms.together import TogetherAI, TogetherAIAPIKey
 from fastagency.models.toolboxes.toolbox import OpenAPIAuth, Toolbox
 
+from .helpers import add_random_sufix, expand_fixture, get_by_tag, tag, tag_list
+
+F = TypeVar("F", bound=Callable[..., Any])
+
 
 @pytest_asyncio.fixture(scope="session")  # type: ignore[misc]
 async def user_uuid() -> AsyncIterator[str]:
@@ -49,6 +63,13 @@ async def user_uuid() -> AsyncIterator[str]:
         pass
 
 
+################################################################################
+###
+###                           Fixtures for LLMs
+###
+################################################################################
+
+
 def azure_model_llm_config(model_env_name: str) -> Dict[str, Any]:
     api_key = os.getenv("AZURE_OPENAI_API_KEY", default="*" * 64)
     api_base = os.getenv(
@@ -77,14 +98,15 @@ def azure_model_llm_config(model_env_name: str) -> Dict[str, Any]:
     return llm_config
 
 
+@tag("llm_config")
 @pytest.fixture()
 def azure_gpt35_turbo_16k_llm_config() -> Dict[str, Any]:
     return azure_model_llm_config("AZURE_GPT35_MODEL")
 
 
 def openai_llm_config(model: str) -> Dict[str, Any]:
-    stars = "*" * 20
-    api_key = os.getenv("OPENAI_API_KEY", default=f"sk-{stars}T3BlbkFJ{stars}")
+    zeros = "0" * 20
+    api_key = os.getenv("OPENAI_API_KEY", default=f"sk-{zeros}T3BlbkFJ{zeros}")
 
     config_list = [
         {
@@ -101,19 +123,14 @@ def openai_llm_config(model: str) -> Dict[str, Any]:
     return llm_config
 
 
+@tag("llm_config")
 @pytest.fixture()
 def openai_gpt35_turbo_16k_llm_config() -> Dict[str, Any]:
     return openai_llm_config("gpt-3.5-turbo")
 
 
-# model/* constructors
-
-
-def add_random_sufix(prefix: str) -> str:
-    return f"{prefix}_{random.randint(0, 1_000_000_000):09d}"
-
-
-@pytest_asyncio.fixture()  # type: ignore[misc]
+@tag("llm_key")
+@pytest_asyncio.fixture()
 async def azure_oai_key_ref(
     user_uuid: str, azure_gpt35_turbo_16k_llm_config: Dict[str, Any]
 ) -> ObjectReference:
@@ -127,7 +144,8 @@ async def azure_oai_key_ref(
     )
 
 
-@pytest_asyncio.fixture()  # type: ignore[misc]
+@tag("llm")
+@pytest_asyncio.fixture()
 async def azure_oai_ref(
     user_uuid: str,
     azure_gpt35_turbo_16k_llm_config: Dict[str, Any],
@@ -147,8 +165,9 @@ async def azure_oai_ref(
     )
 
 
-@pytest_asyncio.fixture()  # type: ignore[misc]
-async def openai_oai_key_ref(
+@tag("llm_key")
+@pytest_asyncio.fixture()
+async def openai_oai_key_gpt35_ref(
     user_uuid: str, openai_gpt35_turbo_16k_llm_config: Dict[str, Any]
 ) -> ObjectReference:
     api_key = openai_gpt35_turbo_16k_llm_config["config_list"][0]["api_key"]
@@ -161,11 +180,12 @@ async def openai_oai_key_ref(
     )
 
 
-@pytest_asyncio.fixture()  # type: ignore[misc]
+@tag("llm")
+@pytest_asyncio.fixture()
 async def openai_oai_ref(
     user_uuid: str,
     openai_gpt35_turbo_16k_llm_config: Dict[str, Any],
-    openai_oai_key_ref: ObjectReference,
+    openai_oai_key_gpt35_ref: ObjectReference,
 ) -> ObjectReference:
     kwargs = openai_gpt35_turbo_16k_llm_config["config_list"][0].copy()
     kwargs.pop("api_key")
@@ -175,13 +195,14 @@ async def openai_oai_ref(
         "llm",
         user_uuid=user_uuid,
         name=add_random_sufix("azure_oai"),
-        api_key=openai_oai_key_ref,
+        api_key=openai_oai_key_gpt35_ref,
         temperature=temperature,
         **kwargs,
     )
 
 
-@pytest_asyncio.fixture()  # type: ignore[misc]
+@tag("llm_key")
+@pytest_asyncio.fixture()
 async def anthropic_key_ref(user_uuid: str) -> ObjectReference:
     api_key = os.getenv(
         "ANTHROPIC_API_KEY",
@@ -197,7 +218,8 @@ async def anthropic_key_ref(user_uuid: str) -> ObjectReference:
     )
 
 
-@pytest_asyncio.fixture()  # type: ignore[misc]
+@tag("llm")
+@pytest_asyncio.fixture()
 async def anthropic_ref(
     user_uuid: str,
     anthropic_key_ref: ObjectReference,
@@ -211,7 +233,8 @@ async def anthropic_ref(
     )
 
 
-@pytest_asyncio.fixture()  # type: ignore[misc]
+@tag("llm_key")
+@pytest_asyncio.fixture()
 async def together_ai_key_ref(user_uuid: str) -> ObjectReference:
     api_key = os.getenv(
         "TOGETHER_API_KEY",
@@ -222,12 +245,13 @@ async def together_ai_key_ref(user_uuid: str) -> ObjectReference:
         TogetherAIAPIKey,
         "secret",
         user_uuid=user_uuid,
-        name=add_random_sufix("together_api_key"),
+        name=add_random_sufix("togetherai_api_key"),
         api_key=api_key,
     )
 
 
-@pytest_asyncio.fixture()  # type: ignore[misc]
+@tag("llm")
+@pytest_asyncio.fixture()
 async def togetherai_ref(
     user_uuid: str,
     together_ai_key_ref: ObjectReference,
@@ -236,12 +260,17 @@ async def togetherai_ref(
         TogetherAI,
         "llm",
         user_uuid=user_uuid,
-        name=add_random_sufix("together_api"),
+        name=add_random_sufix("togetherai"),
         api_key=together_ai_key_ref,
+        model="Mixtral-8x7B Instruct v0.1",
     )
 
 
-# FastAPI app for testing
+################################################################################
+###
+###                          Fixtures for Toolkit
+###
+################################################################################
 
 
 class Item(BaseModel):
@@ -347,6 +376,7 @@ def weather_fastapi_openapi_url() -> Iterator[str]:
         yield openapi_url
 
 
+@tag("toolbox", "items")
 @pytest_asyncio.fixture()  # type: ignore[misc]
 async def toolbox_ref(user_uuid: str, fastapi_openapi_url: str) -> ObjectReference:
     openapi_auth = await create_model_ref(
@@ -370,6 +400,7 @@ async def toolbox_ref(user_uuid: str, fastapi_openapi_url: str) -> ObjectReferen
     return toolbox
 
 
+@tag("toolbox", "weather")
 @pytest_asyncio.fixture()  # type: ignore[misc]
 async def weather_toolbox_ref(
     user_uuid: str, weather_fastapi_openapi_url: str
@@ -393,3 +424,39 @@ async def weather_toolbox_ref(
     )
 
     return toolbox
+
+
+################################################################################
+###
+###                           Fixtures for Agents
+###
+################################################################################
+
+
+@tag_list("assistant", "weather")
+@expand_fixture(
+    dst_fixture_prefix="assistant_weather",
+    src_fixtures_names=get_by_tag("llm"),
+    placeholder_name="llm_ref",
+)
+async def placeholder_assistant_ref(
+    user_uuid: str, llm_ref: ObjectReference, weather_toolbox_ref: ObjectReference
+) -> ObjectReference:
+    return await create_model_ref(
+        AssistantAgent,
+        "agent",
+        user_uuid=user_uuid,
+        name=add_random_sufix("assistant_weather"),
+        llm=llm_ref,
+        toolbox_1=weather_toolbox_ref,
+        system_message="You are a helpful assistant with access to Weather API. After you successfully answer the question asked and there are no new questions, terminate the chat by outputting 'TERMINATE'",
+    )
+
+
+# FastAPI app for testing
+
+################################################################################
+###
+###                        Fixtures for application
+###
+################################################################################
diff --git a/tests/helpers.py b/tests/helpers.py
new file mode 100644
index 00000000..e8d02025
--- /dev/null
+++ b/tests/helpers.py
@@ -0,0 +1,172 @@
+import functools
+import inspect
+import random
+import types
+from asyncio import iscoroutinefunction
+from typing import Any, Callable, Dict, List, Tuple, TypeVar
+
+import pytest
+import pytest_asyncio
+
+__all__ = ["add_random_sufix", "parametrize_fixtures", "tag", "tag_list"]
+
+
+def add_random_sufix(prefix: str) -> str:
+    return f"{prefix}_{random.randint(0, 1_000_000_000):09d}"
+
+
+F = TypeVar("F", bound=Callable[..., Any])
+
+_tags: Dict[str, List[str]] = {}
+
+
+def tag(*args: str) -> Callable[[F], F]:
+    def decorator(f: F, args: Tuple[str, ...] = args) -> F:
+        global _tags
+        if not hasattr(f, "_pytestfixturefunction"):
+            raise ValueError(f"function {f.__name__} is not a fixture")
+
+        name = f._pytestfixturefunction.name
+        if name is None:
+            name = f.__name__
+
+        for my_tag in args:
+            if my_tag in _tags:
+                _tags[my_tag].append(name)
+            else:
+                _tags[my_tag] = [name]
+
+        return f
+
+    return decorator
+
+
+def tag_list(*args: str) -> Callable[[List[F]], List[F]]:
+    def decorator(fs: List[F], args: Tuple[str, ...] = args) -> List[F]:
+        return [tag(*args)(f) for f in fs]
+
+    return decorator
+
+
+def get_by_tag(*args: str) -> List[str]:
+    xs = [_tags.get(my_tag, []) for my_tag in args]
+    return list(functools.reduce(set.intersection, map(set, xs)))  # type: ignore[arg-type]
+
+
+def get_tags() -> List[str]:
+    return list(_tags.keys())
+
+
+def get_caller_globals() -> Dict[str, Any]:
+    # Get the caller's frame
+    caller_frame = inspect.stack()[2].frame
+
+    # Set the global variable in the caller's module
+    caller_globals = caller_frame.f_globals
+
+    return caller_globals
+
+
+def parametrize_fixtures(
+    parameter_name: str, src_fixtures: List[str]
+) -> Callable[[F], F]:
+    def decorator(f: F, parameter_name: str = parameter_name) -> F:
+        f = pytest.mark.parametrize(parameter_name, src_fixtures, indirect=True)(f)
+
+        # this is needed to make the fixture available in the caller's module
+        @pytest.fixture(name=parameter_name)
+        def wrapper(request: Any) -> Any:
+            return request.getfixturevalue(request.param)
+
+        caller_globals = get_caller_globals()
+
+        var_name = add_random_sufix(f"parametrized_fixtures_{parameter_name}")
+        caller_globals[var_name] = wrapper
+
+        return f
+
+    return decorator
+
+
+def rename_parameter(src_name: str, dst_name: str) -> Callable[[F], F]:
+    def decorator(f: F) -> F:
+        # Get the original signature of the function
+        sig = inspect.signature(f)
+
+        # Create a new parameter list with src_name replaced by dst_name
+        params = [
+            inspect.Parameter(
+                dst_name if param.name == src_name else param.name,
+                param.kind,
+                default=param.default,
+                annotation=param.annotation,
+            )
+            for param in sig.parameters.values()
+        ]
+
+        # Create a new signature with the modified parameters
+        new_sig = sig.replace(parameters=params)
+
+        # Define the body of the new function
+        if iscoroutinefunction(f):
+
+            async def wrapper(*args, **kwargs):  # type: ignore[no-untyped-def]
+                bound_args = new_sig.bind(*args, **kwargs)
+                bound_args.apply_defaults()
+                arguments = bound_args.arguments
+
+                if dst_name in arguments:
+                    arguments[src_name] = arguments.pop(dst_name)
+
+                return await f(**arguments)
+        else:
+
+            def wrapper(*args, **kwargs):  # type: ignore[no-untyped-def]
+                bound_args = new_sig.bind(*args, **kwargs)
+                bound_args.apply_defaults()
+                arguments = bound_args.arguments
+
+                if dst_name in arguments:
+                    arguments[src_name] = arguments.pop(dst_name)
+
+                return f(**arguments)
+
+        # Create the new function with the modified signature
+        new_func = types.FunctionType(
+            wrapper.__code__,
+            globals(),
+            name=f.__name__,
+            argdefs=wrapper.__defaults__,
+            closure=wrapper.__closure__,
+        )
+        new_func.__signature__ = new_sig  # type: ignore[attr-defined]
+        functools.update_wrapper(new_func, f)
+        return new_func  # type: ignore
+
+    return decorator
+
+
+def expand_fixture(
+    dst_fixture_prefix: str,
+    src_fixtures_names: List[str],
+    placeholder_name: str,
+) -> Callable[[F], List[F]]:
+    def decorator(f: F) -> List[F]:
+        retval: List[F] = []
+        for src_type in src_fixtures_names:
+            name = f"{dst_fixture_prefix}_{src_type}"
+
+            f_renamed = rename_parameter(placeholder_name, src_type)(f)
+            if iscoroutinefunction(f):
+                f_fixture = pytest_asyncio.fixture(name=name)(f_renamed)
+            else:
+                f_fixture = pytest.fixture(name=name)(f_renamed)
+
+            caller_globals = get_caller_globals()
+            caller_globals[name] = f_fixture
+
+            retval.append(f_fixture)
+
+        return retval
+
+    return decorator
diff --git a/tests/models/agents/test_assistant.py b/tests/models/agents/test_assistant.py
index 90f9237a..ea2db345 100644
--- a/tests/models/agents/test_assistant.py
+++ b/tests/models/agents/test_assistant.py
@@ -1,38 +1,25 @@
-import os
-import uuid
-from typing import Any, Dict
-
 import autogen
 import pytest
-from fastapi import BackgroundTasks
-from pydantic import ValidationError
 
-from fastagency.app import add_model
+from fastagency.helpers import create_autogen
 from fastagency.models.agents.assistant import AssistantAgent
-from fastagency.models.base import Model
-from fastagency.models.llms.azure import AzureOAI, AzureOAIAPIKey
-from fastagency.models.llms.openai import OpenAI
-from fastagency.models.toolboxes.toolbox import OpenAPIAuth, Toolbox
+from fastagency.models.base import ObjectReference
 from fastagency.openapi.client import Client
 
+from ...helpers import get_by_tag, parametrize_fixtures
 
-class TestAssistantAgent:
-    @pytest.mark.parametrize("llm_model", [OpenAI, AzureOAI])
-    def test_assistant_constructor(self, llm_model: Model) -> None:
-        llm_uuid = uuid.uuid4()
-        llm = llm_model.get_reference_model()(uuid=llm_uuid)
-
-        try:
-            agent = AssistantAgent(
-                llm=llm,
-                system_message="test system message",
-                name="Hello World!",
-            )
-        except ValidationError:
-            # print(f"{e.errors()=}")
-            raise
 
-        assert agent.system_message == "test system message"
+class TestAssistantAgent:
+    @pytest.mark.asyncio()
+    @pytest.mark.db()
+    @pytest.mark.llm()
+    @parametrize_fixtures("assistant_ref", get_by_tag("assistant"))
+    async def test_assistant_construction(
+        self,
+        user_uuid: str,
+        assistant_ref: ObjectReference,
+    ) -> None:
+        print(f"test_assistant_construction({user_uuid=}, {assistant_ref=})")  # noqa: T201
 
     def test_assistant_model_schema(self) -> None:
         schema = AssistantAgent.model_json_schema()
@@ -232,134 +219,53 @@ def test_assistant_model_schema(self) -> None:
         }
         assert schema == expected
 
-    @pytest.mark.parametrize("llm_model", [OpenAI, AzureOAI])
-    def test_assistant_model_validation(self, llm_model: Model) -> None:
-        llm_uuid = uuid.uuid4()
-        llm = llm_model.get_reference_model()(uuid=llm_uuid)
-
-        agent = AssistantAgent(
-            llm=llm,
-            name="My Assistant",
-            system_message="test system message",
-        )
-
-        agent_json = agent.model_dump_json()
-        # print(f"{agent_json=}")
-        assert agent_json is not None
-
-        validated_agent = AssistantAgent.model_validate_json(agent_json)
-        # print(f"{validated_agent=}")
-        assert validated_agent is not None
-        assert validated_agent == agent
-
     @pytest.mark.asyncio()
     @pytest.mark.db()
-    @pytest.mark.parametrize("llm_model,api_key_model", [(AzureOAI, AzureOAIAPIKey)])  # noqa: PT006
-    async def test_assistant_model_create_autogen(
+    @parametrize_fixtures("assistant_ref", get_by_tag("assistant"))
+    async def test_assistant_create_autogen(
         self,
-        llm_model: Model,
-        api_key_model: Model,
-        azure_gpt35_turbo_16k_llm_config: Dict[str, Any],
         user_uuid: str,
-        fastapi_openapi_url: str,
-        monkeypatch: pytest.MonkeyPatch,
+        assistant_ref: ObjectReference,
     ) -> None:
-        # Add secret, llm, agent to database
-        api_key = api_key_model(  # type: ignore [operator]
-            api_key=os.getenv("AZURE_OPENAI_API_KEY"),
-            name="api_key_model_name",
-        )
-        api_key_model_uuid = str(uuid.uuid4())
-        await add_model(
-            user_uuid=user_uuid,
-            type_name="secret",
-            model_name=api_key_model.__name__,  # type: ignore [attr-defined]
-            model_uuid=api_key_model_uuid,
-            model=api_key.model_dump(),
-            background_tasks=BackgroundTasks(),
-        )
-
-        llm = llm_model(  # type: ignore [operator]
-            name="llm_model_name",
-            model=os.getenv("AZURE_GPT35_MODEL"),
-            api_key=api_key.get_reference_model()(uuid=api_key_model_uuid),
-            base_url=os.getenv("AZURE_API_ENDPOINT"),
-            api_version=os.getenv("AZURE_API_VERSION"),
-        )
-        llm_model_uuid = str(uuid.uuid4())
-        await add_model(
+        ag_assistant, ag_toolkits = await create_autogen(
+            model_ref=assistant_ref,
             user_uuid=user_uuid,
-            type_name="llm",
-            model_name=llm_model.__name__,  # type: ignore [attr-defined]
-            model_uuid=llm_model_uuid,
-            model=llm.model_dump(),
-            background_tasks=BackgroundTasks(),
         )
+        assert isinstance(ag_assistant, autogen.agentchat.AssistantAgent)
+        assert isinstance(ag_toolkits[0], Client)
+        assert len(ag_toolkits) == 1
 
-        # add toolbox to database
-        openapi_auth = OpenAPIAuth(
-            name="openapi_auth_secret",
-            username="test",
-            password="password",  # pragma: allowlist secret
-        )
-        openapi_auth_model_uuid = str(uuid.uuid4())
+    # todo: fix this test
+    weather_assistants = get_by_tag("assistant", "weather")
+    weather_assistants.remove("assistant_weather_togetherai_ref")
+    # weather_assistants.remove("weather_toolbox_ref")
 
-        await add_model(
-            user_uuid=user_uuid,
-            type_name="secret",
-            model_name=OpenAPIAuth.__name__,  # type: ignore [attr-defined]
-            model_uuid=openapi_auth_model_uuid,
-            model=openapi_auth.model_dump(),
-            background_tasks=BackgroundTasks(),
-        )
-
-        toolbox_uuid = str(uuid.uuid4())
-        toolbox = Toolbox(
-            name="test_toolbox_constructor",
-            openapi_url=fastapi_openapi_url,
-            openapi_auth=openapi_auth.get_reference_model()(
-                uuid=openapi_auth_model_uuid
-            ),
-        )
-
-        await add_model(
+    @pytest.mark.asyncio()
+    @pytest.mark.db()
+    @pytest.mark.llm()
+    @parametrize_fixtures("assistant_ref", weather_assistants)
+    async def test_assistant_weather_end2end(
+        self,
+        user_uuid: str,
+        assistant_ref: ObjectReference,
+    ) -> None:
+        ag_assistant, ag_toolkits = await create_autogen(
+            model_ref=assistant_ref,
             user_uuid=user_uuid,
-            type_name="toolbox",
-            model_name=Toolbox.__name__,  # type: ignore [attr-defined]
-            model_uuid=toolbox_uuid,
-            model=toolbox.model_dump(),
-            background_tasks=BackgroundTasks(),
         )
 
-        # add agent to database
-        weatherman_assistant_model = AssistantAgent(
-            llm=llm.get_reference_model()(uuid=llm_model_uuid),
-            name="Assistant",
-            system_message="test system message",
-            toolbox_1=toolbox.get_reference_model()(uuid=toolbox_uuid),
+        user_proxy = autogen.agentchat.UserProxyAgent(
+            name="user_proxy",
+            human_input_mode="NEVER",
+            max_consecutive_auto_reply=10,
         )
-        weatherman_assistant_model_uuid = str(uuid.uuid4())
-        await add_model(
-            user_uuid=user_uuid,
-            type_name="agent",
-            model_name=AssistantAgent.__name__,
-            model_uuid=weatherman_assistant_model_uuid,
-            model=weatherman_assistant_model.model_dump(),
-            background_tasks=BackgroundTasks(),
+        weather_tool: Client = ag_toolkits[0]
+        weather_tool.register_for_execution(user_proxy)
+        weather_tool.register_for_llm(ag_assistant)
+        chat_result = user_proxy.initiate_chat(
+            ag_assistant, message="What is the weather in New York?"
         )
 
-        async def my_create_autogen(cls, model_id, user_id) -> Dict[str, Any]:  # type: ignore [no-untyped-def]
-            return azure_gpt35_turbo_16k_llm_config
-
-        # Monkeypatch llm and call create_autogen
-        monkeypatch.setattr(AzureOAI, "create_autogen", my_create_autogen)
-
-        agent, clients = await AssistantAgent.create_autogen(
-            model_id=uuid.UUID(weatherman_assistant_model_uuid),
-            user_id=uuid.UUID(user_uuid),
-        )
-        assert isinstance(agent, autogen.agentchat.AssistantAgent)
-        assert len(clients) == 1
-        client = clients[0]
-        assert isinstance(client, Client)
-        assert len(client.registered_funcs) == 3
+        messages = [msg["content"] for msg in chat_result.chat_history]
+        for w in ["New York", "sunny", "TERMINATE"]:
+            assert any(msg is not None and w in msg for msg in messages), (w, messages)
diff --git a/tests/models/agents/test_web_surfer.py b/tests/models/agents/test_web_surfer.py
index c87da772..ff0cd202 100644
--- a/tests/models/agents/test_web_surfer.py
+++ b/tests/models/agents/test_web_surfer.py
@@ -312,7 +312,7 @@ async def test_web_surfer_model_create_autogen(
     ) -> None:
         # Add secret, llm, agent to database
         api_key = api_key_model(  # type: ignore [operator]
-            api_key=os.getenv("AZURE_OPENAI_API_KEY"),
+            api_key=os.getenv("AZURE_OPENAI_API_KEY", default="*" * 64),
             name="api_key_model_name",
         )
         api_key_model_uuid = str(uuid.uuid4())
@@ -327,10 +327,12 @@ async def test_web_surfer_model_create_autogen(
 
         llm = llm_model(  # type: ignore [operator]
             name="llm_model_name",
-            model=os.getenv("AZURE_GPT35_MODEL"),
+            model=os.getenv("AZURE_GPT35_MODEL", default="gpt-35-turbo-16k"),
             api_key=api_key.get_reference_model()(uuid=api_key_model_uuid),
-            base_url=os.getenv("AZURE_API_ENDPOINT"),
-            api_version=os.getenv("AZURE_API_VERSION"),
+            base_url=os.getenv(
+                "AZURE_API_ENDPOINT", default="https://my-deployment.openai.azure.com"
+            ),
+            api_version=os.getenv("AZURE_API_VERSION", default="2024-02-01"),
         )
         llm_model_uuid = str(uuid.uuid4())
         await add_model(
diff --git a/tests/models/llms/test_anthropic.py b/tests/models/llms/test_anthropic.py
index 69aa69a9..05b9a4fe 100644
--- a/tests/models/llms/test_anthropic.py
+++ b/tests/models/llms/test_anthropic.py
@@ -6,37 +6,16 @@
 from fastagency.models.base import ObjectReference
 from fastagency.models.llms.anthropic import Anthropic, AnthropicAPIKey
 
-from .test_end2end import end2end_simple_chat_with_two_agents
-
 
 def test_import(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.delenv("ANTHROPIC_API_KEY", raising=False)
 
-    from fastagency.models.llms.anthropic import Anthropic, AnthropicAPIKey
+    from fastagency.models.llms.anthropic import Anthropic
 
     assert Anthropic is not None
     assert AnthropicAPIKey is not None
 
 
-class TestAnthropicOAIAPIKey:
-    @pytest.mark.asyncio()
-    @pytest.mark.db()
-    async def test_anthropic_api_key_model_create_autogen(
-        self,
-        anthropic_key_ref: ObjectReference,
-        user_uuid: str,
-    ) -> None:
-        model = await get_model_by_ref(anthropic_key_ref)
-        assert isinstance(model, AnthropicAPIKey)
-
-        # Call create_autogen
-        actual_api_key = await AnthropicAPIKey.create_autogen(
-            model_id=anthropic_key_ref.uuid,
-            user_id=uuid.UUID(user_uuid),
-        )
-        assert isinstance(actual_api_key, str)
-
-
 class TestAnthropic:
     @pytest.mark.db()
     @pytest.mark.asyncio()
@@ -175,17 +154,3 @@ async def test_anthropic_model_create_autogen(
         }
 
         assert actual_llm_config == expected
-
-    @pytest.mark.asyncio()
-    @pytest.mark.db()
-    @pytest.mark.anthropic()
-    async def test_end2end(
-        self,
-        user_uuid: str,
-        anthropic_ref: ObjectReference,
-    ) -> None:
-        llm_config = await Anthropic.create_autogen(
-            model_id=anthropic_ref.uuid,
-            user_id=uuid.UUID(user_uuid),
-        )
-        end2end_simple_chat_with_two_agents(llm_config=llm_config)
diff --git a/tests/models/llms/test_azure.py b/tests/models/llms/test_azure.py
index 977e4b85..47a7204d 100644
--- a/tests/models/llms/test_azure.py
+++ b/tests/models/llms/test_azure.py
@@ -1,43 +1,21 @@
-import uuid
 from typing import Any, Dict
 
 import pytest
 
-from fastagency.helpers import get_model_by_ref
+from fastagency.helpers import create_autogen, get_model_by_ref
 from fastagency.models.base import ObjectReference
 from fastagency.models.llms.azure import AzureOAI, AzureOAIAPIKey
 
-from .test_end2end import end2end_simple_chat_with_two_agents
-
 
 def test_import(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.delenv("AZURE_OAI_API_KEY", raising=False)
 
-    from fastagency.models.llms.azure import AzureOAI, AzureOAIAPIKey
+    from fastagency.models.llms.azure import AzureOAI
 
     assert AzureOAI is not None
     assert AzureOAIAPIKey is not None
 
 
-class TestAzureOAIAPIKey:
-    @pytest.mark.asyncio()
-    @pytest.mark.db()
-    async def test_azure_api_key_model_create_autogen(
-        self,
-        azure_oai_key_ref: ObjectReference,
-        user_uuid: str,
-    ) -> None:
-        model = await get_model_by_ref(azure_oai_key_ref)
-        assert isinstance(model, AzureOAIAPIKey)
-
-        # Call create_autogen
-        actual_api_key = await AzureOAIAPIKey.create_autogen(
-            model_id=azure_oai_key_ref.uuid,
-            user_id=uuid.UUID(user_uuid),
-        )
-        assert isinstance(actual_api_key, str)
-
-
 class TestAzureOAI:
     @pytest.mark.db()
     @pytest.mark.asyncio()
@@ -170,9 +148,9 @@ async def test_azure_model_create_autogen(
         azure_oai_ref: ObjectReference,
         azure_gpt35_turbo_16k_llm_config: Dict[str, Any],
     ) -> None:
-        actual_llm_config = await AzureOAI.create_autogen(
-            model_id=azure_oai_ref.uuid,
-            user_id=uuid.UUID(user_uuid),
+        actual_llm_config = await create_autogen(
+            model_ref=azure_oai_ref,
+            user_uuid=user_uuid,
         )
         assert isinstance(actual_llm_config, dict)
         assert (
@@ -180,17 +158,3 @@ async def test_azure_model_create_autogen(
             == azure_gpt35_turbo_16k_llm_config["config_list"][0]
         )
         assert actual_llm_config == azure_gpt35_turbo_16k_llm_config
-
-    @pytest.mark.asyncio()
-    @pytest.mark.db()
-    @pytest.mark.azure_oai()
-    async def test_end2end(
-        self,
-        user_uuid: str,
-        azure_oai_ref: ObjectReference,
-    ) -> None:
-        llm_config = await AzureOAI.create_autogen(
-            model_id=azure_oai_ref.uuid,
-            user_id=uuid.UUID(user_uuid),
-        )
-        end2end_simple_chat_with_two_agents(llm_config=llm_config)
diff --git a/tests/models/llms/test_end2end.py b/tests/models/llms/test_end2end.py
index b13e8097..85ac077e 100644
--- a/tests/models/llms/test_end2end.py
+++ b/tests/models/llms/test_end2end.py
@@ -1,15 +1,25 @@
 from typing import Any, Dict
 
+import pytest
 from autogen.agentchat import AssistantAgent
 
-# from fastagency.models.agents.assistant import AssistantAgent
-from ...conftest import add_random_sufix
+from fastagency.helpers import create_autogen
+from fastagency.models.base import ObjectReference
 
+from ...helpers import add_random_sufix, get_by_tag, parametrize_fixtures
 
-def end2end_simple_chat_with_two_agents(
-    llm_config: Dict[str, Any],
+
+@pytest.mark.asyncio()
+@pytest.mark.db()
+@pytest.mark.llm()
+@parametrize_fixtures("llm_ref", get_by_tag("llm"))
+async def test_end2end_simple_chat_with_two_agents(
+    user_uuid: str,
+    llm_ref: ObjectReference,
 ) -> None:
-    flags: Dict[str, bool] = {"terminated": False}
+    llm_config = await create_autogen(model_ref=llm_ref, user_uuid=user_uuid)
+
+    flags: Dict[str, bool] = {}
 
     def is_termination_msg(msg: Dict[str, Any]) -> bool:
         flags["terminated"] = "TERMINATE" in msg["content"]
diff --git a/tests/models/llms/test_llm_keys.py b/tests/models/llms/test_llm_keys.py
new file mode 100644
index 00000000..2d2580ee
--- /dev/null
+++ b/tests/models/llms/test_llm_keys.py
@@ -0,0 +1,35 @@
+import pytest
+
+from fastagency.helpers import create_autogen, get_model_by_ref
+from fastagency.models.base import Model, ObjectReference
+
+from ...helpers import get_by_tag, parametrize_fixtures
+
+
+class TestLLMKeys:
+    @pytest.mark.asyncio()
+    @pytest.mark.db()
+    @pytest.mark.llm()
+    @parametrize_fixtures("llm_key_ref", get_by_tag("llm_key"))
+    async def test_llm_key_constructor(
+        self,
+        llm_key_ref: ObjectReference,
+    ) -> None:
+        model = await get_model_by_ref(llm_key_ref)
+        assert isinstance(model, Model)
+
+    @pytest.mark.asyncio()
+    @pytest.mark.db()
+    @pytest.mark.llm()
+    @parametrize_fixtures("llm_key_ref", get_by_tag("llm_key"))
+    async def test_llm_key_create_autogen(
+        self,
+        user_uuid: str,
+        llm_key_ref: ObjectReference,
+    ) -> None:
+        # Call create_autogen
+        actual_api_key = await create_autogen(
+            model_ref=llm_key_ref,
+            user_uuid=user_uuid,
+        )
+        assert isinstance(actual_api_key, str)
diff --git a/tests/models/llms/test_openai.py b/tests/models/llms/test_openai.py
index b892d197..9306fca6 100644
--- a/tests/models/llms/test_openai.py
+++ b/tests/models/llms/test_openai.py
@@ -6,8 +6,6 @@
 from fastagency.models.base import ObjectReference
 from fastagency.models.llms.openai import OpenAI, OpenAIAPIKey
 
-from .test_end2end import end2end_simple_chat_with_two_agents
-
 
 def test_import(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.delenv("OPENAI_API_KEY", raising=False)
@@ -36,23 +34,6 @@ def test_constructor_failure(self) -> None:
                 name="Hello World!",
             )  # pragma: allowlist secret
 
-    @pytest.mark.asyncio()
-    @pytest.mark.db()
-    async def test_openai_api_key_model_create_autogen(
-        self,
-        openai_oai_key_ref: ObjectReference,
-        user_uuid: str,
-    ) -> None:
-        model = await get_model_by_ref(openai_oai_key_ref)
-        assert isinstance(model, OpenAIAPIKey)
-
-        # Call create_autogen
-        actual_api_key = await OpenAIAPIKey.create_autogen(
-            model_id=openai_oai_key_ref.uuid,
-            user_id=uuid.UUID(user_uuid),
-        )
-        assert isinstance(actual_api_key, str)
-
 
 class TestOpenAI:
     @pytest.mark.db()
@@ -204,17 +185,3 @@ async def test_openai_model_create_autogen(
         }
 
         assert actual_llm_config == expected
-
-    @pytest.mark.asyncio()
-    @pytest.mark.db()
-    @pytest.mark.openai()
-    async def test_end2end(
-        self,
-        user_uuid: str,
-        openai_oai_ref: ObjectReference,
-    ) -> None:
-        llm_config = await OpenAI.create_autogen(
-            model_id=openai_oai_ref.uuid,
-            user_id=uuid.UUID(user_uuid),
-        )
-        end2end_simple_chat_with_two_agents(llm_config=llm_config)
diff --git a/tests/models/llms/test_together.py b/tests/models/llms/test_together.py
index 59fcab55..2cbdfcaf 100644
--- a/tests/models/llms/test_together.py
+++ b/tests/models/llms/test_together.py
@@ -12,8 +12,6 @@
     together_model_string,
 )
 
-from .test_end2end import end2end_simple_chat_with_two_agents
-
 
 def test_import(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.delenv("TOGETHER_API_KEY", raising=False)
@@ -43,23 +41,6 @@ def test_constructor_failure(self) -> None:
                 name="Hello World!",
             )  # pragma: allowlist secret
 
-    @pytest.mark.asyncio()
-    @pytest.mark.db()
-    async def test_togetherai_api_key_model_create_autogen(
-        self,
-        together_ai_key_ref: ObjectReference,
-        user_uuid: str,
-    ) -> None:
-        model = await get_model_by_ref(together_ai_key_ref)
-        assert isinstance(model, TogetherAIAPIKey)
-
-        # Call create_autogen
-        actual_api_key = await TogetherAIAPIKey.create_autogen(
-            model_id=together_ai_key_ref.uuid,
-            user_id=uuid.UUID(user_uuid),
-        )
-        assert isinstance(actual_api_key, str)
-
 
 class TestTogetherAI:
     @pytest.mark.togetherai()
@@ -91,7 +72,7 @@ async def test_togetherai_constructor(
 
         expected = {
             "name": name,
-            "model": "Meta Llama 3 70B Chat",
+            "model": "Mixtral-8x7B Instruct v0.1",
             "api_key": {
                 "type": "secret",
                 "name": "TogetherAIAPIKey",
@@ -205,7 +186,7 @@ async def test_togetherai_model_create_autogen(
         expected = {
             "config_list": [
                 {
-                    "model": "meta-llama/Llama-3-70b-chat-hf",
+                    "model": "mistralai/Mixtral-8x7B-Instruct-v0.1",
                     "api_key": api_key,
                     "base_url": "https://api.together.xyz/v1",
                     "api_type": "togetherai",
@@ -215,17 +196,3 @@ async def test_togetherai_model_create_autogen(
         }
 
         assert actual_llm_config == expected
-
-    @pytest.mark.asyncio()
-    @pytest.mark.db()
-    @pytest.mark.togetherai()
-    async def test_end2end(
-        self,
-        user_uuid: str,
-        togetherai_ref: ObjectReference,
-    ) -> None:
-        llm_config = await TogetherAI.create_autogen(
-            model_id=togetherai_ref.uuid,
-            user_id=uuid.UUID(user_uuid),
-        )
-        end2end_simple_chat_with_two_agents(llm_config=llm_config)
diff --git a/tests/models/teams/test_multi_agents_team.py b/tests/models/teams/test_multi_agents_team.py
index a4eb4559..51483768 100644
--- a/tests/models/teams/test_multi_agents_team.py
+++ b/tests/models/teams/test_multi_agents_team.py
@@ -284,7 +284,7 @@ async def test_multi_agent_team_autogen(
         pass
         # Add secret, llm, agent, team to database
         # api_key = api_key_model(  # type: ignore [operator]
-        #     api_key=os.getenv("AZURE_OPENAI_API_KEY"),
+        #     api_key = os.getenv("AZURE_OPENAI_API_KEY", default="*" * 64),
         #     name="api_key_model_name",
         # )
         # api_key_model_uuid = str(uuid.uuid4())
@@ -298,143 +298,146 @@ async def test_multi_agent_team_autogen(
 
         # llm = llm_model(  # type: ignore [operator]
         #     name="llm_model_name",
-        #     model=os.getenv("AZURE_GPT35_MODEL"),
+        #     model=os.getenv(AZURE_GPT35_MODEL, default="gpt-35-turbo-16k"),
         #     api_key=api_key.get_reference_model()(uuid=api_key_model_uuid),
-        #     base_url=os.getenv("AZURE_API_ENDPOINT"),
-        #     api_version=os.getenv("AZURE_API_VERSION"),
-        # )
-        # llm_model_uuid = str(uuid.uuid4())
-        # await add_model(
-        #     user_uuid=user_uuid,
-        #     type_name="llm",
-        #     model_name=llm_model.__name__,  # type: ignore [attr-defined]
-        #     model_uuid=llm_model_uuid,
-        #     model=llm.model_dump(),
-        # )
-
-        # user_proxy_model = UserProxyAgent(
-        #     name="UserProxyAgent",
-        #     llm=llm.get_reference_model()(uuid=llm_model_uuid),
-        # )
-        # user_proxy_model_uuid = str(uuid.uuid4())
-        # await add_model(
-        #     user_uuid=user_uuid,
-        #     type_name="agent",
-        #     model_name=UserProxyAgent.__name__,
-        #     model_uuid=user_proxy_model_uuid,
-        #     model=user_proxy_model.model_dump(),
-        # )
-
-        # weatherman_assistant_model_1 = AssistantAgent(
-        #     llm=llm.get_reference_model()(uuid=llm_model_uuid),
-        #     name="Assistant",
-        #     system_message="test system message",
-        # )
-        # weatherman_assistant_model_1_uuid = str(uuid.uuid4())
-        # await add_model(
-        #     user_uuid=user_uuid,
-        #     type_name="agent",
-        #     model_name=AssistantAgent.__name__,
-        #     model_uuid=weatherman_assistant_model_1_uuid,
-        #     model=weatherman_assistant_model_1.model_dump(),
-        # )
-
-        # team_model_uuid = str(uuid.uuid4())
-        # agent_1 = user_proxy_model.get_reference_model()(uuid=user_proxy_model_uuid)
-        # agent_2 = weatherman_assistant_model_1.get_reference_model()(
-        #     uuid=weatherman_assistant_model_1_uuid
-        # )
-
-        # team = MultiAgentTeam(
-        #     name="MultiAgentTeam",
-        #     agent_1=agent_1,
-        #     agent_2=agent_2,
-        # )
-        # await add_model(
-        #     user_uuid=user_uuid,
-        #     type_name="team",
-        #     model_name=MultiAgentTeam.__name__,
-        #     model_uuid=team_model_uuid,
-        #     model=team.model_dump(),
-        # )
-
-        # # Then create autogen agents by monkeypatching create_autogen method
-        # user_proxy_agent = autogen.agentchat.UserProxyAgent(
-        #     "user_proxy",
-        #     code_execution_config=False,
-        # )
-
-        # weatherman_agent_1 = autogen.agentchat.AssistantAgent(
-        #     name="weather_man_1",
-        #     system_message="You are the weather man. Ask the user to give you the name of a city and then provide the weather forecast for that city.",
-        #     llm_config=llm_config,
-        #     code_execution_config=False,
-        # )
-
-        # get_forecast_for_city_mock = MagicMock()
-
-        # # @user_proxy_agent.register_for_execution()  # type: ignore [misc]
-        # # @weatherman_agent_1.register_for_llm(
-        # #     description="Get weather forecast for a city"
-        # # )  # type: ignore [misc]
-        # def get_forecast_for_city(city: str) -> str:
-        #     get_forecast_for_city_mock(city)
-        #     return f"The weather in {city} is sunny today."
-
-        # async def weatherman_create_autogen(  # type: ignore [no-untyped-def]
-        #     cls, model_id, user_id
-        # ) -> autogen.agentchat.AssistantAgent:
-        #     f_info = FunctionInfo(
-        #         function=get_forecast_for_city,
-        #         description="Get weather forecast for a city",
-        #         name="get_forecast_for_city",
-        #     )
-        #     return weatherman_agent_1, [f_info]
-
-        # async def user_proxy_create_autogen(  # type: ignore [no-untyped-def]
-        #     cls, model_id, user_id
-        # ) -> autogen.agentchat.UserProxyAgent:
-        #     return user_proxy_agent, []
-
-        # if enable_monkeypatch:
-        #     monkeypatch.setattr(
-        #         AssistantAgent, "create_autogen", weatherman_create_autogen
-        #     )
-
-        #     monkeypatch.setattr(
-        #         UserProxyAgent, "create_autogen", user_proxy_create_autogen
-        #     )
-
-        # team = await MultiAgentTeam.create_autogen(
-        #     model_id=uuid.UUID(team_model_uuid), user_id=uuid.UUID(user_uuid)
-        # )
-
-        # assert hasattr(team, "initiate_chat")
-
-        # d = {"count": 0}
-
-        # def input(prompt: str, d: Dict[str, int] = d) -> str:
-        #     d["count"] += 1
-        #     if d["count"] == 1:
-        #         return f"[{datetime.now()}] What's the weather in New York today?"
-        #     elif d["count"] == 2:
-        #         return ""
-        #     else:
-        #         return "exit"
-
-        # monkeypatch.setattr(IOConsole, "input", lambda self, prompt: input(prompt))
-
-        # chat_result = team.initiate_chat(
-        #     message="Hi! Tell me the city for which you want the weather forecast.",
-        # )
-
-        # last_message = chat_result.chat_history[-1]
-
-        # if enable_monkeypatch:
-        #     get_forecast_for_city_mock.assert_called_once_with("New York")
-        #     # get_forecast_for_city_mock.assert_not_called()
-        #     assert "sunny" in last_message["content"]
-        # else:
-        #     # assert "sunny" not in last_message["content"]
-        #     # assert "weather" in last_message["content"]
-        #     assert isinstance(last_message["content"], str)
+        #     base_url=os.getenv(
+        # "AZURE_API_ENDPOINT", default="https://my-deployment.openai.azure.com"
+
+    # ),
+    #     api_version=os.getenv("AZURE_API_VERSION", default="2024-02-01"),
+    # )
+    # llm_model_uuid = str(uuid.uuid4())
+    # await add_model(
+    #     user_uuid=user_uuid,
+    #     type_name="llm",
+    #     model_name=llm_model.__name__,  # type: ignore [attr-defined]
+    #     model_uuid=llm_model_uuid,
+    #     model=llm.model_dump(),
+    # )
+
+    # user_proxy_model = UserProxyAgent(
+    #     name="UserProxyAgent",
+    #     llm=llm.get_reference_model()(uuid=llm_model_uuid),
+    # )
+    # user_proxy_model_uuid = str(uuid.uuid4())
+    # await add_model(
+    #     user_uuid=user_uuid,
+    #     type_name="agent",
+    #     model_name=UserProxyAgent.__name__,
+    #     model_uuid=user_proxy_model_uuid,
+    #     model=user_proxy_model.model_dump(),
+    # )
+
+    # weatherman_assistant_model_1 = AssistantAgent(
+    #     llm=llm.get_reference_model()(uuid=llm_model_uuid),
+    #     name="Assistant",
+    #     system_message="test system message",
+    # )
+    # weatherman_assistant_model_1_uuid = str(uuid.uuid4())
+    # await add_model(
+    #     user_uuid=user_uuid,
+    #     type_name="agent",
+    #     model_name=AssistantAgent.__name__,
+    #     model_uuid=weatherman_assistant_model_1_uuid,
+    #     model=weatherman_assistant_model_1.model_dump(),
+    # )
+
+    # team_model_uuid = str(uuid.uuid4())
+    # agent_1 = user_proxy_model.get_reference_model()(uuid=user_proxy_model_uuid)
+    # agent_2 = weatherman_assistant_model_1.get_reference_model()(
+    #     uuid=weatherman_assistant_model_1_uuid
+    # )
+
+    # team = MultiAgentTeam(
+    #     name="MultiAgentTeam",
+    #     agent_1=agent_1,
+    #     agent_2=agent_2,
+    # )
+    # await add_model(
+    #     user_uuid=user_uuid,
+    #     type_name="team",
+    #     model_name=MultiAgentTeam.__name__,
+    #     model_uuid=team_model_uuid,
+    #     model=team.model_dump(),
+    # )
+
+    # # Then create autogen agents by monkeypatching create_autogen method
+    # user_proxy_agent = autogen.agentchat.UserProxyAgent(
+    #     "user_proxy",
+    #     code_execution_config=False,
+    # )
+
+    # weatherman_agent_1 = autogen.agentchat.AssistantAgent(
+    #     name="weather_man_1",
+    #     system_message="You are the weather man. Ask the user to give you the name of a city and then provide the weather forecast for that city.",
+    #     llm_config=llm_config,
+    #     code_execution_config=False,
+    # )
+
+    # get_forecast_for_city_mock = MagicMock()
+
+    # # @user_proxy_agent.register_for_execution()  # type: ignore [misc]
+    # # @weatherman_agent_1.register_for_llm(
+    # #     description="Get weather forecast for a city"
+    # # )  # type: ignore [misc]
+    # def get_forecast_for_city(city: str) -> str:
+    #     get_forecast_for_city_mock(city)
+    #     return f"The weather in {city} is sunny today."
+
+    # async def weatherman_create_autogen(  # type: ignore [no-untyped-def]
+    #     cls, model_id, user_id
+    # ) -> autogen.agentchat.AssistantAgent:
+    #     f_info = FunctionInfo(
+    #         function=get_forecast_for_city,
+    #         description="Get weather forecast for a city",
+    #         name="get_forecast_for_city",
+    #     )
+    #     return weatherman_agent_1, [f_info]
+
+    # async def user_proxy_create_autogen(  # type: ignore [no-untyped-def]
+    #     cls, model_id, user_id
+    # ) -> autogen.agentchat.UserProxyAgent:
+    #     return user_proxy_agent, []
+
+    # if enable_monkeypatch:
+    #     monkeypatch.setattr(
+    #         AssistantAgent, "create_autogen", weatherman_create_autogen
+    #     )
+
+    #     monkeypatch.setattr(
+    #         UserProxyAgent, "create_autogen", user_proxy_create_autogen
+    #     )
+
+    # team = await MultiAgentTeam.create_autogen(
+    #     model_id=uuid.UUID(team_model_uuid), user_id=uuid.UUID(user_uuid)
+    # )
+
+    # assert hasattr(team, "initiate_chat")
+
+    # d = {"count": 0}
+
+    # def input(prompt: str, d: Dict[str, int] = d) -> str:
+    #     d["count"] += 1
+    #     if d["count"] == 1:
+    #         return f"[{datetime.now()}] What's the weather in New York today?"
+    #     elif d["count"] == 2:
+    #         return ""
+    #     else:
+    #         return "exit"
+
+    # monkeypatch.setattr(IOConsole, "input", lambda self, prompt: input(prompt))
+
+    # chat_result = team.initiate_chat(
+    #     message="Hi! Tell me the city for which you want the weather forecast.",
+    # )
+
+    # last_message = chat_result.chat_history[-1]
+
+    # if enable_monkeypatch:
+    #     get_forecast_for_city_mock.assert_called_once_with("New York")
+    #     # get_forecast_for_city_mock.assert_not_called()
+    #     assert "sunny" in last_message["content"]
+    # else:
+    #     # assert "sunny" not in last_message["content"]
+    #     # assert "weather" in last_message["content"]
+    #     assert isinstance(last_message["content"], str)
diff --git a/tests/models/teams/test_two_agents_team.py b/tests/models/teams/test_two_agents_team.py
index 8e1d7156..4c94484d 100644
--- a/tests/models/teams/test_two_agents_team.py
+++ b/tests/models/teams/test_two_agents_team.py
@@ -238,7 +238,7 @@ async def test_two_agent_team_autogen(
         pass
         # # Add secret, llm, agent, team to database
         # api_key = api_key_model(  # type: ignore [operator]
-        #     api_key=os.getenv("AZURE_OPENAI_API_KEY"),
+        #     api_key = os.getenv("AZURE_OPENAI_API_KEY", default="*" * 64),
         #     name="api_key_model_name",
         # )
         # api_key_model_uuid = str(uuid.uuid4())
@@ -252,138 +252,141 @@ async def test_two_agent_team_autogen(
 
         # llm = llm_model(  # type: ignore [operator]
         #     name="llm_model_name",
-        #     model=os.getenv("AZURE_GPT35_MODEL"),
+        #     model=os.getenv(AZURE_GPT35_MODEL, default="gpt-35-turbo-16k"),
         #     api_key=api_key.get_reference_model()(uuid=api_key_model_uuid),
-        #     base_url=os.getenv("AZURE_API_ENDPOINT"),
-        #     api_version=os.getenv("AZURE_API_VERSION"),
-        # )
-        # llm_model_uuid = str(uuid.uuid4())
-        # llm_validated_model = await add_model(
-        #     user_uuid=user_uuid,
-        #     type_name="llm",
-        #     model_name=llm_model.__name__,  # type: ignore [attr-defined]
-        #     model_uuid=llm_model_uuid,
-        #     model=llm.model_dump(),
-        # )
-
-        # weatherman_assistant_model = AssistantAgent(
-        #     llm=llm.get_reference_model()(uuid=llm_model_uuid),
-        #     name="Assistant",
-        #     system_message="test system message",
-        # )
-        # weatherman_assistant_model_uuid = str(uuid.uuid4())
-        # weatherman_assistant_validated_model = await add_model(
-        #     user_uuid=user_uuid,
-        #     type_name="agent",
-        #     model_name=AssistantAgent.__name__,
-        #     model_uuid=weatherman_assistant_model_uuid,
-        #     model=weatherman_assistant_model.model_dump(),
-        # )
-
-        # user_proxy_model = UserProxyAgent(
-        #     name="UserProxyAgent",
-        #     llm=llm.get_reference_model()(uuid=llm_model_uuid),
-        # )
-        # user_proxy_model_uuid = str(uuid.uuid4())
-        # user_proxy_validated_model = await add_model(
-        #     user_uuid=user_uuid,
-        #     type_name="agent",
-        #     model_name=UserProxyAgent.__name__,
-        #     model_uuid=user_proxy_model_uuid,
-        #     model=user_proxy_model.model_dump(),
-        # )
-
-        # team_model_uuid = str(uuid.uuid4())
-        # initial_agent = weatherman_assistant_model.get_reference_model()(
-        #     uuid=weatherman_assistant_model_uuid
-        # )
-        # secondary_agent = user_proxy_model.get_reference_model()(
-        #     uuid=user_proxy_model_uuid
-        # )
-        # team = TwoAgentTeam(
-        #     name="TwoAgentTeam",
-        #     initial_agent=initial_agent,
-        #     secondary_agent=secondary_agent,
-        # )
-        # team_validated_model = await add_model(
-        #     user_uuid=user_uuid,
-        #     type_name="team",
-        #     model_name=TwoAgentTeam.__name__,
-        #     model_uuid=team_model_uuid,
-        #     model=team.model_dump(),
-        # )
-
-        # # Then create autogen agents by monkeypatching create_autogen method
-        # weatherman_agent = autogen.agentchat.AssistantAgent(
-        #     name="weather_man",
-        #     system_message="You are the weather man. Ask the user to give you the name of a city and then provide the weather forecast for that city.",
-        #     llm_config=llm_config,
-        #     code_execution_config=False,
-        # )
-
-        # user_proxy_agent = autogen.agentchat.UserProxyAgent(
-        #     "user_proxy",
-        #     code_execution_config=False,
-        # )
-
-        # get_forecast_for_city_mock = MagicMock()
-
-        # async def weatherman_create_autogen(
-        #     cls: Model, model_id: uuid.UUID, user_id: uuid.UUID
-        # ) -> autogen.agentchat.AssistantAgent:
-        #     def get_forecast_for_city(city: str) -> str:
-        #         get_forecast_for_city_mock(city)
-        #         return f"The weather in {city} is sunny today."
-
-        # f_info = FunctionInfo(
-        #     name="get_forecast_for_city",
-        #     description="Get weather forecast for a city",
-        #     function=get_forecast_for_city,
-        # )
-        # return weatherman_agent, [f_info]
-
-        # async def user_proxy_create_autogen(
-        #     cls: Model, model_id: uuid.UUID, user_id: uuid.UUID
-        # ) -> autogen.agentchat.UserProxyAgent:
-        #     return user_proxy_agent, []
-
-        # if enable_monkeypatch:
-        #     monkeypatch.setattr(
-        #         AssistantAgent, "create_autogen", weatherman_create_autogen
-        #     )
-        #     monkeypatch.setattr(
-        #         UserProxyAgent, "create_autogen", user_proxy_create_autogen
-        #     )
-
-        # team = await TwoAgentTeam.create_autogen(
-        #     model_id=uuid.UUID(team_model_uuid), user_id=uuid.UUID(user_uuid)
-        # )
-
-        # assert hasattr(team, "initiate_chat")
-
-        # d = {"count": 0}
-
-        # def input(prompt: str, d: Dict[str, int] = d) -> str:
-        #     d["count"] += 1
-        #     if d["count"] == 1:
-        #         return f"[{datetime.now()}] What's the weather in New York today?"
-        #     elif d["count"] == 2:
-        #         return ""
-        #     else:
-        #         return "exit"
-
-        # monkeypatch.setattr(IOConsole, "input", lambda self, prompt: input(prompt))
-
-        # chat_result = team.initiate_chat(
-        #     message="Hi! Tell me the city for which you want the weather forecast.",
-        # )
-
-        # last_message = chat_result.chat_history[-1]
-
-        # if enable_monkeypatch:
-        #     get_forecast_for_city_mock.assert_called_once_with("New York")
-        #     assert "sunny" in last_message["content"]
-        # else:
-        #     # assert "sunny" not in last_message["content"]
-        #     # assert "weather" in last_message["content"]
-        #     assert isinstance(last_message["content"], str)
+        #     base_url=os.getenv(
+        # "AZURE_API_ENDPOINT", default="https://my-deployment.openai.azure.com"
+
+    # ),
+    #     api_version=os.getenv("AZURE_API_VERSION", default="2024-02-01"),
+    # )
+    # llm_model_uuid = str(uuid.uuid4())
+    # llm_validated_model = await add_model(
+    #     user_uuid=user_uuid,
+    #     type_name="llm",
+    #     model_name=llm_model.__name__,  # type: ignore [attr-defined]
+    #     model_uuid=llm_model_uuid,
+    #     model=llm.model_dump(),
+    # )
+
+    # weatherman_assistant_model = AssistantAgent(
+    #     llm=llm.get_reference_model()(uuid=llm_model_uuid),
+    #     name="Assistant",
+    #     system_message="test system message",
+    # )
+    # weatherman_assistant_model_uuid = str(uuid.uuid4())
+    # weatherman_assistant_validated_model = await add_model(
+    #     user_uuid=user_uuid,
+    #     type_name="agent",
+    #     model_name=AssistantAgent.__name__,
+    #     model_uuid=weatherman_assistant_model_uuid,
+    #     model=weatherman_assistant_model.model_dump(),
+    # )
+
+    # user_proxy_model = UserProxyAgent(
+    #     name="UserProxyAgent",
+    #     llm=llm.get_reference_model()(uuid=llm_model_uuid),
+    # )
+    # user_proxy_model_uuid = str(uuid.uuid4())
+    # user_proxy_validated_model = await add_model(
+    #     user_uuid=user_uuid,
+    #     type_name="agent",
+    #     model_name=UserProxyAgent.__name__,
+    #     model_uuid=user_proxy_model_uuid,
+    #     model=user_proxy_model.model_dump(),
+    # )
+
+    # team_model_uuid = str(uuid.uuid4())
+    # initial_agent = weatherman_assistant_model.get_reference_model()(
+    #     uuid=weatherman_assistant_model_uuid
+    # )
+    # secondary_agent = user_proxy_model.get_reference_model()(
+    #     uuid=user_proxy_model_uuid
+    # )
+    # team = TwoAgentTeam(
+    #     name="TwoAgentTeam",
+    #     initial_agent=initial_agent,
+    #     secondary_agent=secondary_agent,
+    # )
+    # team_validated_model = await add_model(
+    #     user_uuid=user_uuid,
+    #     type_name="team",
+    #     model_name=TwoAgentTeam.__name__,
+    #     model_uuid=team_model_uuid,
+    #     model=team.model_dump(),
+    # )
+
+    # # Then create autogen agents by monkeypatching create_autogen method
+    # weatherman_agent = autogen.agentchat.AssistantAgent(
+    #     name="weather_man",
+    #     system_message="You are the weather man. Ask the user to give you the name of a city and then provide the weather forecast for that city.",
+    #     llm_config=llm_config,
+    #     code_execution_config=False,
+    # )
+
+    # user_proxy_agent = autogen.agentchat.UserProxyAgent(
+    #     "user_proxy",
+    #     code_execution_config=False,
+    # )
+
+    # get_forecast_for_city_mock = MagicMock()
+
+    # async def weatherman_create_autogen(
+    #     cls: Model, model_id: uuid.UUID, user_id: uuid.UUID
+    # ) -> autogen.agentchat.AssistantAgent:
+    #     def get_forecast_for_city(city: str) -> str:
+    #         get_forecast_for_city_mock(city)
+    #         return f"The weather in {city} is sunny today."
+
+    # f_info = FunctionInfo(
+    #     name="get_forecast_for_city",
+    #     description="Get weather forecast for a city",
+    #     function=get_forecast_for_city,
+    # )
+    # return weatherman_agent, [f_info]
+
+    # async def user_proxy_create_autogen(
+    #     cls: Model, model_id: uuid.UUID, user_id: uuid.UUID
+    # ) -> autogen.agentchat.UserProxyAgent:
+    #     return user_proxy_agent, []
+
+    # if enable_monkeypatch:
+    #     monkeypatch.setattr(
+    #         AssistantAgent, "create_autogen", weatherman_create_autogen
+    #     )
+    #     monkeypatch.setattr(
+    #         UserProxyAgent, "create_autogen", user_proxy_create_autogen
+    #     )
+
+    # team = await TwoAgentTeam.create_autogen(
+    #     model_id=uuid.UUID(team_model_uuid), user_id=uuid.UUID(user_uuid)
+    # )
+
+    # assert hasattr(team, "initiate_chat")
+
+    # d = {"count": 0}
+
+    # def input(prompt: str, d: Dict[str, int] = d) -> str:
+    #     d["count"] += 1
+    #     if d["count"] == 1:
+    #         return f"[{datetime.now()}] What's the weather in New York today?"
+    #     elif d["count"] == 2:
+    #         return ""
+    #     else:
+    #         return "exit"
+
+    # monkeypatch.setattr(IOConsole, "input", lambda self, prompt: input(prompt))
+
+    # chat_result = team.initiate_chat(
+    #     message="Hi! Tell me the city for which you want the weather forecast.",
+    # )
+
+    # last_message = chat_result.chat_history[-1]
+
+    # if enable_monkeypatch:
+    #     get_forecast_for_city_mock.assert_called_once_with("New York")
+    #     assert "sunny" in last_message["content"]
+    # else:
+    #     # assert "sunny" not in last_message["content"]
+    #     # assert "weather" in last_message["content"]
+    #     assert isinstance(last_message["content"], str)
diff --git a/tests/test_nats.py b/tests/test_nats.py
index 8174bcae..4bbeadeb 100644
--- a/tests/test_nats.py
+++ b/tests/test_nats.py
@@ -334,7 +334,7 @@ async def test_ionats_e2e(
 
         # Add secret, llm, agent, team to database
         api_key = api_key_model(  # type: ignore [operator]
-            api_key=os.getenv("AZURE_OPENAI_API_KEY"),
+            api_key=os.getenv("AZURE_OPENAI_API_KEY", default="*" * 64),
             name="api_key_model_name",
         )
         api_key_model_uuid = str(uuid.uuid4())
@@ -349,10 +349,12 @@ async def test_ionats_e2e(
 
         llm = llm_model(  # type: ignore [operator]
             name="llm_model_name",
-            model=os.getenv("AZURE_GPT35_MODEL"),
+            model=os.getenv("AZURE_GPT35_MODEL", default="gpt-35-turbo-16k"),
             api_key=api_key.get_reference_model()(uuid=api_key_model_uuid),
-            base_url=os.getenv("AZURE_API_ENDPOINT"),
-            api_version=os.getenv("AZURE_API_VERSION"),
+            base_url=os.getenv(
+                "AZURE_API_ENDPOINT", default="https://my-deployment.openai.azure.com"
+            ),
+            api_version=os.getenv("AZURE_API_VERSION", default="2024-02-01"),
         )
         llm_model_uuid = str(uuid.uuid4())
         await add_model(

From 24f6c4a7c5e1ff01ae052e0280f79a7b396913d8 Mon Sep 17 00:00:00 2001
From: Davor Runje <davor@airt.ai>
Date: Tue, 2 Jul 2024 06:51:01 +0200
Subject: [PATCH 5/7] bug fix and updated packages (#479)

---
 fastagency/models/llms/together.py | 1 -
 pyproject.toml                     | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/fastagency/models/llms/together.py b/fastagency/models/llms/together.py
index 7ec6fe2c..55136de8 100644
--- a/fastagency/models/llms/together.py
+++ b/fastagency/models/llms/together.py
@@ -49,7 +49,6 @@
     "Platypus2 Instruct (70B)": "garage-bAInd/Platypus2-70B-instruct",
     "Gemma Instruct (2B)": "google/gemma-2b-it",
     "Gemma Instruct (7B)": "google/gemma-7b-it",
-    "Gemma-2 Instruct (9B)": "google/gemma-2-9b-it",
     "Vicuna v1.5 (13B)": "lmsys/vicuna-13b-v1.5",
     "Vicuna v1.5 (7B)": "lmsys/vicuna-7b-v1.5",
     "Reserved - DBRX Instruct": "medaltv/dbrx-instruct",
diff --git a/pyproject.toml b/pyproject.toml
index 8b105e7a..c5ff7172 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -73,7 +73,7 @@ devdocs = [
     "mkdocstrings[python]==0.25.1",
     "mkdocs-literate-nav==0.6.1",
     "mkdocs-git-revision-date-localized-plugin==1.2.6",
-    "mike==2.1.1",  # versioning
+    "mike==2.1.2",  # versioning
     "mkdocs-minify-plugin==0.8.0",
     "mkdocs-macros-plugin==1.0.5",  # includes with variables
     "mkdocs-glightbox==0.4.0",  # img zoom
@@ -88,11 +88,11 @@ lint = [
     "types-ujson",
     "types-Pygments",
     "types-docutils",
-    "mypy==1.10.0",
-    "ruff==0.4.9",
+    "mypy==1.10.1",
+    "ruff==0.5.0",
     "pyupgrade-directories==0.3.0",
     "bandit==1.7.9",
-    "semgrep==1.71.0",
+    "semgrep==1.78.0",
     "pytest-mypy-plugins==3.1.2",
 ]
 

From 81009999a464bfd9437b2c4fc86005a26a388e43 Mon Sep 17 00:00:00 2001
From: Kumaran Rajendhiran <kumaran@airt.ai>
Date: Tue, 2 Jul 2024 12:06:04 +0530
Subject: [PATCH 6/7] Read coverage files from pipeline.yaml (#483)

---
 .github/workflows/publish_coverage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish_coverage.yml b/.github/workflows/publish_coverage.yml
index 2b6de719..3e470da0 100644
--- a/.github/workflows/publish_coverage.yml
+++ b/.github/workflows/publish_coverage.yml
@@ -24,7 +24,7 @@ jobs:
 
       - uses: dawidd6/action-download-artifact@v6  # nosemgrep
         with:
-          workflow: test.yaml
+          workflow: pipeline.yaml
           commit: ${{ github.event.workflow_run.head_sha }}
 
       - run: smokeshow upload coverage-html

From 560620fa1307580f175c11f72e0166832502155f Mon Sep 17 00:00:00 2001
From: Davor Runje <davor@airt.ai>
Date: Tue, 2 Jul 2024 09:02:26 +0200
Subject: [PATCH 7/7] Refactor CI: remove public environment (#484)

* wip

* wip

* wip

* wip

* wip

* wip

---------

Co-authored-by: Kumaran Rajendhiran <kumaran@airt.ai>
---
 .github/workflows/pipeline.yaml |  4 +++-
 .github/workflows/test.yaml     | 35 +++++++++++++++++++++++++--------
 .secrets.baseline               |  6 +++---
 scripts/test.sh                 |  2 +-
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
index 80b57fa3..6ab2ddd2 100644
--- a/.github/workflows/pipeline.yaml
+++ b/.github/workflows/pipeline.yaml
@@ -62,7 +62,7 @@ jobs:
     uses: ./.github/workflows/test.yaml
     with:
       python-version: ${{ matrix.python-version }}
-      environment: public
+      environment: null
       use-llms: false
     secrets: inherit  # pragma: allowlist secret
 
@@ -73,6 +73,8 @@ jobs:
       environment: testing
       use-llms: true
     secrets: inherit  # pragma: allowlist secret
+    needs:
+      - test-without-llms
 
   test-macos-latest:
     if: github.event.pull_request.draft == false
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index a0fc7937..bb9eb400 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -5,7 +5,8 @@ on:
     inputs:
       environment:
         description: 'Environment to run the tests in'
-        required: true
+        required: false
+        default: null
         type: string
       python-version:
         description: 'Python version to run the tests in'
@@ -47,15 +48,33 @@ jobs:
       DATABASE_URL: postgresql://admin:password@localhost:5432/fastagency
       PY_DATABASE_URL: postgresql://admin:password@localhost:5433/pyfastagency
       NATS_URL: nats://localhost:4222
-      AZURE_API_VERSION: ${{ vars.AZURE_API_VERSION }}
-      AZURE_API_ENDPOINT: ${{ vars.AZURE_API_ENDPOINT }}
-      AZURE_GPT35_MODEL: ${{ vars.AZURE_GPT35_MODEL }}
-      AZURE_OPENAI_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
-      TOGETHER_API_KEY: ${{ secrets.TOGETHER_API_KEY }}
-      OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-      ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
 
     steps:
+      - name: Set up environment variables
+        run: |
+          # check if an environment var or secret is defined and set env var to its value
+          if [ -n "${{ vars.AZURE_API_VERSION }}" ]; then
+            echo "AZURE_API_VERSION=${{ vars.AZURE_API_VERSION }}" >> $GITHUB_ENV
+          fi
+          if [ -n "${{ vars.AZURE_API_ENDPOINT }}" ]; then
+            echo "AZURE_API_ENDPOINT=${{ vars.AZURE_API_ENDPOINT }}" >> $GITHUB_ENV
+          fi
+          if [ -n "${{ vars.AZURE_GPT35_MODEL }}" ]; then
+            echo "AZURE_GPT35_MODEL=${{ vars.AZURE_GPT35_MODEL }}" >> $GITHUB_ENV
+          fi
+          if [ -n "${{ secrets.AZURE_OPENAI_API_KEY }}" ]; then
+            echo "AZURE_OPENAI_API_KEY=${{ secrets.AZURE_OPENAI_API_KEY }}" >> $GITHUB_ENV
+          fi
+          if [ -n "${{ secrets.TOGETHER_API_KEY }}" ]; then
+            echo "TOGETHER_API_KEY=${{ secrets.TOGETHER_API_KEY }}" >> $GITHUB_ENV
+          fi
+          if [ -n "${{ secrets.OPENAI_API_KEY }}" ]; then
+            echo "OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}" >> $GITHUB_ENV
+          fi
+          if [ -n "${{ secrets.ANTHROPIC_API_KEY }}" ]; then
+            echo "ANTHROPIC_API_KEY=${{ secrets.ANTHROPIC_API_KEY }}" >> $GITHUB_ENV
+          fi
+
       - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v5
diff --git a/.secrets.baseline b/.secrets.baseline
index 6ef826e2..d1c08700 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -118,7 +118,7 @@
         "filename": ".github/workflows/test.yaml",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 32,
+        "line_number": 33,
         "is_secret": false
       },
       {
@@ -126,7 +126,7 @@
         "filename": ".github/workflows/test.yaml",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 47,
+        "line_number": 48,
         "is_secret": false
       }
     ],
@@ -141,5 +141,5 @@
       }
     ]
   },
-  "generated_at": "2024-07-01T12:57:48Z"
+  "generated_at": "2024-07-02T05:22:08Z"
 }
diff --git a/scripts/test.sh b/scripts/test.sh
index 69cfd4de..3e7602f7 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -2,4 +2,4 @@
 
 # coverage run -m pytest -x --ff "$@" || \
 # coverage run -m pytest -x --ff "$@" || \
-coverage run -m pytest -x --ff "$@"
+coverage run -m pytest --ff "$@"