Refactor API Endpoints into Services Folder

agenta-web/src/components/AppSelector/AppCard.tsx

@@ -1,11 +1,10 @@
 import {Modal, Card, Avatar} from "antd"
 import {DeleteOutlined} from "@ant-design/icons"
-import {removeApp} from "@/lib/services/api"
+import {removeApp} from "@/services/api"
 import {useState} from "react"
 import Link from "next/link"
 import {renameVariablesCapitalizeAll} from "@/lib/helpers/utils"
 import {createUseStyles} from "react-jss"
-import {getGradientFromStr} from "@/lib/helpers/colors"
 import {ListAppsItem} from "@/lib/Types"
 import {useAppsData} from "@/contexts/app.context"
 

agenta-web/src/components/AppSelector/AppSelector.tsx

@@ -7,12 +7,7 @@ import {useAppTheme} from "../Layout/ThemeContextProvider"
 import TipsAndFeatures from "./TipsAndFeatures"
 import Welcome from "./Welcome"
 import {isAppNameInputValid, isDemo, redirectIfNoLLMKeys} from "@/lib/helpers/utils"
-import {
-    createAndStartTemplate,
-    getTemplates,
-    removeApp,
-    waitForAppToStart,
-} from "@/lib/services/api"
+import {createAndStartTemplate, getTemplates, removeApp, waitForAppToStart} from "@/services/api"
 import AddNewAppModal from "./modals/AddNewAppModal"
 import AddAppFromTemplatedModal from "./modals/AddAppFromTemplateModal"
 import MaxAppModal from "./modals/MaxAppModal"

agenta-web/src/components/EvaluationTable/ABTestingEvaluationTable.tsx

@@ -15,10 +15,10 @@ import {
 } from "antd"
 import {
     updateEvaluationScenario,
-    callVariant,
     fetchEvaluationResults,
     updateEvaluation,
-} from "@/lib/services/api"
+} from "@/services/human-evaluations"
+import {callVariant} from "@/services/api"
 import {useVariants} from "@/lib/hooks/useVariant"
 import {useRouter} from "next/router"
 import {EvaluationFlow} from "@/lib/enums"

agenta-web/src/components/EvaluationTable/SingleModelEvaluationTable.tsx

@@ -1,4 +1,4 @@
-import {useState, useEffect, useCallback, useMemo} from "react"
+import {useState, useEffect, useCallback} from "react"
 import type {ColumnType} from "antd/es/table"
 import {CaretRightOutlined} from "@ant-design/icons"
 import {
@@ -15,7 +15,8 @@ import {
     Typography,
     message,
 } from "antd"
-import {updateEvaluationScenario, callVariant, updateEvaluation} from "@/lib/services/api"
+import {callVariant} from "@/services/api"
+import {updateEvaluationScenario, updateEvaluation} from "@/services/human-evaluations"
 import {useVariants} from "@/lib/hooks/useVariant"
 import {useRouter} from "next/router"
 import {EvaluationFlow} from "@/lib/enums"

agenta-web/src/components/Evaluations/AutomaticEvaluationResult.tsx

@@ -1,4 +1,8 @@
-import {deleteEvaluations, fetchEvaluationResults, loadEvaluations} from "@/lib/services/api"
+import {
+    deleteEvaluations,
+    fetchEvaluationResults,
+    loadEvaluations,
+} from "@/services/human-evaluations"
 import {Button, Spin, Statistic, Table, Typography} from "antd"
 import {useRouter} from "next/router"
 import {useEffect, useState} from "react"

agenta-web/src/components/Evaluations/HumanEvaluationResult.tsx

@@ -1,4 +1,5 @@
-import {deleteEvaluations, fetchData} from "@/lib/services/api"
+import {fetchData} from "@/services/api"
+import {deleteEvaluations} from "@/services/human-evaluations"
 import {Button, Spin, Statistic, Table, Typography} from "antd"
 import {useRouter} from "next/router"
 import {useEffect, useState} from "react"

agenta-web/src/components/HumanEvaluationModal/HumanEvaluationModal.tsx

@@ -1,6 +1,7 @@
 import React, {useEffect, useState} from "react"
 import {GenericObject, JSSTheme, Parameter, Variant} from "@/lib/Types"
-import {createNewEvaluation, fetchVariants, useLoadTestsetsList} from "@/lib/services/api"
+import {fetchVariants} from "@/services/api"
+import {createNewEvaluation} from "@/services/human-evaluations"
 import {isDemo} from "@/lib/helpers/utils"
 import {Button, Col, Dropdown, MenuProps, Modal, ModalProps, Row, Spin, message} from "antd"
 import {getErrorMessage} from "@/lib/helpers/errorHandler"
@@ -11,9 +12,9 @@ import {getAllVariantParameters} from "@/lib/helpers/variantHelper"
 import {useRouter} from "next/router"
 import {useAppTheme} from "../Layout/ThemeContextProvider"
 import {createUseStyles} from "react-jss"
-import {getApikeys} from "@/lib/helpers/llmProviders"
 import EvaluationErrorModal from "../Evaluations/EvaluationErrorModal"
 import {dynamicComponent} from "@/lib/helpers/dynamic"
+import {useLoadTestsetsList} from "@/services/testsets"
 
 type StyleProps = {
     themeMode: "dark" | "light"

agenta-web/src/components/Layout/Layout.tsx

@@ -20,7 +20,7 @@ import {createUseStyles} from "react-jss"
 import NoSSRWrapper from "../NoSSRWrapper/NoSSRWrapper"
 import {ErrorBoundary} from "react-error-boundary"
 import ErrorFallback from "./ErrorFallback"
-import {fetchData} from "@/lib/services/api"
+import {fetchData} from "@/services/api"
 import {useAppsData} from "@/contexts/app.context"
 import {useRouter} from "next/router"
 import Image from "next/image"

agenta-web/src/components/Playground/AddToTestSetDrawer/AddToTestSetDrawer.tsx

@@ -2,7 +2,12 @@ import AlertPopup from "@/components/AlertPopup/AlertPopup"
 import {useAppTheme} from "../../Layout/ThemeContextProvider"
 import {ChatMessage, ChatRole, GenericObject, testset} from "@/lib/Types"
 import {removeKeys, renameVariables} from "@/lib/helpers/utils"
-import {createNewTestset, loadTestset, updateTestset, useLoadTestsetsList} from "@/lib/services/api"
+import {
+    createNewTestset,
+    loadTestset,
+    updateTestset,
+    useLoadTestsetsList,
+} from "@/services/testsets"
 import {
     Button,
     Divider,

agenta-web/src/components/Playground/LoadTestsModal.tsx

@@ -1,5 +1,5 @@
-import {loadTestset, useLoadTestsetsList} from "@/lib/services/api"
-import {Button, Divider, Dropdown, Modal, Select, Space} from "antd"
+import {loadTestset, useLoadTestsetsList} from "@/services/testsets"
+import {Button, Divider, Modal, Select} from "antd"
 import {useRouter} from "next/router"
 import {PropsWithChildren, useState} from "react"
 import {createUseStyles} from "react-jss"

agenta-web/src/components/Playground/Playground.tsx

@@ -2,7 +2,8 @@ import React, {useState, useEffect, useRef} from "react"
 import {Button, Tabs, message} from "antd"
 import ViewNavigation from "./ViewNavigation"
 import NewVariantModal from "./NewVariantModal"
-import {fetchEnvironments, fetchVariants, saveNewVariant} from "@/lib/services/api"
+import {fetchVariants, saveNewVariant} from "@/services/api"
+import {fetchEnvironments} from "@/services/deployment"
 import {Variant, PlaygroundTabsItem, Environment} from "@/lib/Types"
 import {AppstoreOutlined, SyncOutlined} from "@ant-design/icons"
 import {useRouter} from "next/router"

agenta-web/src/components/Playground/ViewNavigation.tsx

@@ -13,7 +13,7 @@ import {
     removeVariant,
     restartAppVariantContainer,
     waitForAppToStart,
-} from "@/lib/services/api"
+} from "@/services/api"
 import {useAppsData} from "@/contexts/app.context"
 import {isDemo} from "@/lib/helpers/utils"
 import ResultComponent from "../ResultComponent/ResultComponent"

agenta-web/src/components/Playground/Views/ParametersView.tsx

@@ -5,16 +5,17 @@ import React, {useEffect, useState} from "react"
 import {createUseStyles} from "react-jss"
 import {ModelParameters, ObjectParameters, StringParameters} from "./ParametersCards"
 import PublishVariantModal from "./PublishVariantModal"
-import {promptVersioning, removeVariant} from "@/lib/services/api"
+import {removeVariant} from "@/services/api"
 import {CloudUploadOutlined, DeleteOutlined, HistoryOutlined, SaveOutlined} from "@ant-design/icons"
 import {usePostHogAg} from "@/hooks/usePostHogAg"
 import {isDemo} from "@/lib/helpers/utils"
 import {useQueryParam} from "@/hooks/useQuery"
-import {dynamicComponent} from "@/lib/helpers/dynamic"
+import {dynamicComponent, dynamicService} from "@/lib/helpers/dynamic"
 
 const PromptVersioningDrawer: any = dynamicComponent(
     `PromptVersioningDrawer/PromptVersioningDrawer`,
 )
+const promptVersioning: any = dynamicService("promptVersioning")
 
 interface Props {
     variant: Variant

agenta-web/src/components/Playground/Views/PublishVariantModal.tsx

@@ -1,7 +1,7 @@
 import {usePostHogAg} from "@/hooks/usePostHogAg"
 import {Environment, Variant} from "@/lib/Types"
 import {variantNameWithRev} from "@/lib/helpers/variantHelper"
-import {fetchEnvironments, publishVariant} from "@/lib/services/api"
+import {fetchEnvironments, publishVariant} from "@/services/deployment"
 import {Button, Checkbox, Modal, Space, Typography, message} from "antd"
 import type {CheckboxChangeEvent} from "antd/es/checkbox"
 import {useRouter} from "next/router"

agenta-web/src/components/Playground/Views/TestView.tsx

@@ -1,7 +1,7 @@
 import React, {useContext, useEffect, useRef, useState} from "react"
 import {Button, Input, Card, Row, Col, Space, Form, Modal} from "antd"
 import {CaretRightOutlined, CloseCircleOutlined, PlusOutlined} from "@ant-design/icons"
-import {callVariant, promptRevision} from "@/lib/services/api"
+import {callVariant} from "@/services/api"
 import {ChatMessage, ChatRole, GenericObject, Parameter, Variant} from "@/lib/Types"
 import {batchExecute, randString, removeKeys} from "@/lib/helpers/utils"
 import LoadTestsModal from "../LoadTestsModal"
@@ -23,6 +23,9 @@ import relativeTime from "dayjs/plugin/relativeTime"
 import duration from "dayjs/plugin/duration"
 import {useQueryParam} from "@/hooks/useQuery"
 import {formatLatency} from "@/lib/helpers/formatters"
+import {dynamicService} from "@/lib/helpers/dynamic"
+
+const promptRevision: any = dynamicService("promptVersioning")
 
 dayjs.extend(relativeTime)
 dayjs.extend(duration)
@@ -338,7 +341,7 @@ const App: React.FC<TestViewProps> = ({
             usage: {completion_tokens: number; prompt_tokens: number; total_tokens: number} | null
         }>
     >(testList.map(() => ({cost: null, latency: null, usage: null})))
-    const [revisionNum, setRevisionNum] = useQueryParam("revision")
+    const [revisionNum] = useQueryParam("revision")
 
     useEffect(() => {
         if (!revisionNum) return

agenta-web/src/components/SaveTestsetModal/SaveTestsetModal.tsx

@@ -2,7 +2,7 @@ import React, {useEffect, useState} from "react"
 import {useAppId} from "@/hooks/useAppId"
 import {Evaluation, EvaluationScenario} from "@/lib/Types"
 import {EvaluationFlow} from "@/lib/enums"
-import {createNewTestset} from "@/lib/services/api"
+import {createNewTestset} from "@/services/testsets"
 import {Form, Input, Modal} from "antd"
 
 type EvaluationRow = EvaluationScenario & {

agenta-web/src/components/TestSetTable/TestsetTable.tsx

@@ -4,7 +4,8 @@ import {createUseStyles} from "react-jss"
 import {Button, Input, Tooltip, Typography, message} from "antd"
 import TestsetMusHaveNameModal from "./InsertTestsetNameModal"
 import {DeleteOutlined, EditOutlined, PlusOutlined} from "@ant-design/icons"
-import {createNewTestset, fetchVariants, loadTestset, updateTestset} from "@/lib/services/api"
+import {fetchVariants} from "@/services/api"
+import {createNewTestset, loadTestset, updateTestset} from "@/services/testsets"
 import {useRouter} from "next/router"
 import {useAppTheme} from "../Layout/ThemeContextProvider"
 import useBlockNavigation from "@/hooks/useBlockNavigation"

agenta-web/src/components/pages/evaluations/evaluationResults/NewEvaluationModal.tsx

@@ -2,8 +2,9 @@ import {useAppId} from "@/hooks/useAppId"
 import {JSSTheme, Variant, LLMRunRateLimit, testset} from "@/lib/Types"
 import {evaluatorConfigsAtom, evaluatorsAtom} from "@/lib/atoms/evaluation"
 import {apiKeyObject, redirectIfNoLLMKeys} from "@/lib/helpers/utils"
-import {fetchTestsets, fetchVariants} from "@/lib/services/api"
+import {fetchVariants} from "@/services/api"
 import {CreateEvaluationData, createEvalutaiton} from "@/services/evaluations"
+import {fetchTestsets} from "@/services/testsets"
 import {PlusOutlined, QuestionCircleOutlined} from "@ant-design/icons"
 import {
     Divider,

agenta-web/src/contexts/app.context.tsx

@@ -1,6 +1,6 @@
 import {ListAppsItem} from "@/lib/Types"
 import {getAgentaApiUrl, isDemo} from "@/lib/helpers/utils"
-import {axiosFetcher} from "@/lib/services/api"
+import {axiosFetcher} from "@/services/api"
 import {useRouter} from "next/router"
 import {PropsWithChildren, createContext, useContext, useEffect, useMemo, useState} from "react"
 import useSWR from "swr"

agenta-web/src/contexts/profile.context.tsx

@@ -2,7 +2,7 @@ import {usePostHogAg} from "@/hooks/usePostHogAg"
 import {useSession} from "@/hooks/useSession"
 import useStateCallback from "@/hooks/useStateCallback"
 import {isDemo} from "@/lib/helpers/utils"
-import {getProfile} from "@/lib/services/api"
+import {getProfile} from "@/services/api"
 import {User} from "@/lib/Types"
 import {PropsWithChildren, createContext, useState, useContext, useEffect, useCallback} from "react"
 

agenta-web/src/lib/helpers/variantHelper.ts

@@ -1,6 +1,5 @@
 import {Variant, Parameter, InputParameter} from "@/lib/Types"
-import {getVariantParametersFromOpenAPI} from "@/lib/services/api"
-import {globalErrorHandler} from "./errorHandler"
+import {getVariantParametersFromOpenAPI} from "@/services/api"
 
 const inputParamsToParameters = (additionalInputs: InputParameter[]): Parameter[] => {
     return additionalInputs.map((value) => ({

agenta-web/src/lib/hooks/useVariant.ts

@@ -1,5 +1,5 @@
 import {useState, useEffect} from "react"
-import {saveNewVariant, updateVariantParams} from "@/lib/services/api"
+import {saveNewVariant, updateVariantParams} from "@/services/api"
 import {Variant, Parameter} from "@/lib/Types"
 import {getAllVariantParameters, updateInputParams} from "@/lib/helpers/variantHelper"
 import {PERMISSION_ERR_MSG} from "../helpers/axiosConfig"

agenta-web/src/pages/apps/[app_id]/annotations/human_a_b_testing/[evaluation_id]/index.tsx

@@ -1,9 +1,10 @@
 import ABTestingEvaluationTable from "@/components/EvaluationTable/ABTestingEvaluationTable"
 import {Evaluation} from "@/lib/Types"
-import {loadEvaluation, loadEvaluationsScenarios, loadTestset} from "@/lib/services/api"
+import {loadEvaluation, loadEvaluationsScenarios} from "@/services/human-evaluations"
+import {loadTestset} from "@/services/testsets"
 import {useRouter} from "next/router"
 import {useEffect, useState} from "react"
-import {fetchVariants} from "@/lib/services/api"
+import {fetchVariants} from "@/services/api"
 import {useAtom} from "jotai"
 import {evaluationAtom, evaluationScenariosAtom} from "@/lib/atoms/evaluation"
 import {getTestsetChatColumn} from "@/lib/helpers/testset"

agenta-web/src/pages/apps/[app_id]/annotations/single_model_test/[evaluation_id]/index.tsx

@@ -1,8 +1,9 @@
 import {Evaluation, EvaluationScenario, GenericObject} from "@/lib/Types"
-import {loadEvaluation, loadEvaluationsScenarios, loadTestset} from "@/lib/services/api"
+import {loadEvaluation, loadEvaluationsScenarios} from "@/services/human-evaluations"
+import {loadTestset} from "@/services/testsets"
 import {useRouter} from "next/router"
 import {useEffect, useState} from "react"
-import {fetchVariants} from "@/lib/services/api"
+import {fetchVariants} from "@/services/api"
 import {getTestsetChatColumn} from "@/lib/helpers/testset"
 import SingleModelEvaluationTable from "@/components/EvaluationTable/SingleModelEvaluationTable"
 

agenta-web/src/pages/apps/[app_id]/endpoints/index.tsx

@@ -10,7 +10,8 @@ import {Environment, GenericObject, JSSTheme, Parameter, Variant} from "@/lib/Ty
 import {isDemo} from "@/lib/helpers/utils"
 import {dynamicComponent} from "@/lib/helpers/dynamic"
 import {useVariant} from "@/lib/hooks/useVariant"
-import {fetchEnvironments, fetchVariants, getAppContainerURL} from "@/lib/services/api"
+import {fetchVariants, getAppContainerURL} from "@/services/api"
+import {fetchEnvironments} from "@/services/deployment"
 import {ApiOutlined, AppstoreOutlined, HistoryOutlined} from "@ant-design/icons"
 import {Alert, Collapse, CollapseProps, Empty, Radio, Tabs, Tooltip, Typography} from "antd"
 import {useRouter} from "next/router"

agenta-web/src/pages/apps/[app_id]/testsets/index.tsx

@@ -5,7 +5,7 @@ import {ColumnsType} from "antd/es/table"
 import {useState} from "react"
 import {formatDate} from "@/lib/helpers/dateTimeHelper"
 import {DeleteOutlined} from "@ant-design/icons"
-import {deleteTestsets, useLoadTestsetsList} from "@/lib/services/api"
+import {deleteTestsets, useLoadTestsetsList} from "@/services/testsets"
 import {createUseStyles} from "react-jss"
 import {testset} from "@/lib/Types"
 import {isDemo} from "@/lib/helpers/utils"