Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Handle run via WS; Add run pausing and prompt edit [WIP]
Tomas Valenta1ec04cfdd278
diff --git a/.vscode/settings.json b/.vscode/settings.jsonindex 6cb13409e..be917e559 100644--- a/.vscode/settings.json+++ b/.vscode/settings.json@@ -15,9 +15,9 @@"**/.vercel/**": true,".vscode/**": true,".git/**": true,- "node_modules/**": true,- "package-lock.json": true,- "yarl.lock": true+ "**/node_modules/**": true,+ "**/package-lock.json": true,+ "**/yarl.lock": true},"files.watcherExclude": {"**/.git": true,@@ -35,9 +35,9 @@".next/**": true,".vscode/**": true,".git/**": true,- "node_modules/**": true,- "package-lock.json": true,- "yarl.lock": true+ "**/node_modules/**": true,+ "**/package-lock.json": true,+ "**/yarl.lock": true},"typescript.tsdk": "node_modules/typescript/lib","css.validate": false,diff --git a/api-client/AgentDebugRun.ts b/api-client/AgentDebugRun.tsnew file mode 100644index 000000000..5cdfce5a4--- /dev/null+++ b/api-client/AgentDebugRun.ts@@ -0,0 +1,64 @@+import { RpcWebSocketClient, IRpcNotification } from 'rpc-websocket-client'+import { deployment_state } from '@prisma/client'++import { Log } from 'db/types'+import { ModelConfig } from 'state/model'++export interface Opts {+ onLogs: (logs: Log[]) => void+ onStateChange: (runState: deployment_state) => void+}++export class AgentRun {+ private readonly rpc = new RpcWebSocketClient()+ runID?: string++ constructor(private readonly url: string, private readonly opts: Opts) {+ this.rpc.onNotification.push(this.handleNotification.bind(this))+ }++ async connect() {+ await this.rpc.connect(this.url.replace('http', 'ws'))+ }++ async disconnect() {+ console.log('closing')+ // This is the browser WebSocket way of closing connection+ this.rpc.ws?.close()+ }++ private handleNotification(data: IRpcNotification) {+ console.log('notif', data)+ if (data.method === 'logs') {+ return this.opts.onLogs(data.params.logs)+ }+ if (data.method === 'stateUpdate') {+ this.opts.onStateChange(data.params.state)+ if (data.params.state === deployment_state.finished) {+ this.disconnect()+ }+ }+ }++ async startRun(projectID: string, modelConfig: ModelConfig) {+ const { run_id } = await this.rpc.call('start', [projectID, modelConfig]) as { run_id: string }+ this.runID = run_id+ this.opts.onStateChange(deployment_state.generating)+ }++ async pauseRun() {+ await this.rpc.call('pause')+ }++ async resumeRun() {+ await this.rpc.call('resume')+ }++ async cancelRun() {+ await this.rpc.call('cancel')+ }++ async rewriteRunLogs(logs: Log[]) {+ await this.rpc.call('rewriteLogs', [logs])+ }+}diff --git a/api-client/api/index.ts b/api-client/api/index.tsnew file mode 100644index 000000000..83857cb32--- /dev/null+++ b/api-client/api/index.ts@@ -0,0 +1,20 @@+import 'cross-fetch/polyfill'+import { Fetcher } from 'openapi-typescript-fetch'++import type { components, paths } from './schema.gen'+import { localURL } from 'db/credentials'++export const baseUrl = process.env.NEXT_PUBLIC_PROXY+ ? `${localURL}/api/service`+ : process.env.NEXT_PUBLIC_API_URL++const client = Fetcher.for<paths>()++client.configure({+ baseUrl,+})++type ClientType = typeof client++export default client+export type { components, paths, ClientType }diff --git a/api-client/api/schema.gen.ts b/api-client/api/schema.gen.tsnew file mode 100644index 000000000..c45d6e285--- /dev/null+++ b/api-client/api/schema.gen.ts@@ -0,0 +1,93 @@+/**+ * This file was auto-generated by openapi-typescript.+ * Do not make direct changes to the file.+ */+++export interface paths {+ "/generate": {+ /** Generate */+ post: operations["generate_generate_post"];+ };+}++export type webhooks = Record<string, never>;++export interface components {+ schemas: {+ /** GenerateBody */+ GenerateBody: {+ model_config: components["schemas"]["ModelConfig"];+ /** Project Id */+ project_id: string;+ };+ /** HTTPValidationError */+ HTTPValidationError: {+ /** Detail */+ detail?: (components["schemas"]["ValidationError"])[];+ };+ /** ModelConfig */+ ModelConfig: {+ /** Args */+ args: Record<string, never>;+ /** Prompt */+ prompt: (components["schemas"]["PromptPart"])[];+ /** Provider */+ provider: string;+ };+ /** PromptPart */+ PromptPart: {+ /** Content */+ content: string;+ /**+ * Role+ * @enum {string}+ */+ role: "user" | "system";+ /** Type */+ type: string;+ };+ /** ValidationError */+ ValidationError: {+ /** Location */+ loc: (string | number)[];+ /** Message */+ msg: string;+ /** Error Type */+ type: string;+ };+ };+ responses: never;+ parameters: never;+ requestBodies: never;+ headers: never;+ pathItems: never;+}++export type external = Record<string, never>;++export interface operations {++ /** Generate */+ generate_generate_post: {+ requestBody: {+ content: {+ "application/json": components["schemas"]["GenerateBody"];+ };+ };+ responses: {+ /** @description Successful Response */+ 200: {+ content: {+ "application/json": Record<string, never>;+ };+ };+ /** @description Validation Error */+ 422: {+ content: {+ "application/json": components["schemas"]["HTTPValidationError"];+ };+ };+ };+ };+}diff --git a/api-service/Makefile b/api-service/Makefileindex 9261ef266..72155fdea 100644--- a/api-service/Makefile+++ b/api-service/Makefile@@ -11,3 +11,6 @@ generate-playground-client:--additional-properties=floatStrictType=false \--additional-properties=library=asyncio \--additional-properties=allowStringInDateTimeParameters=false++generate-api-schema:+ poetry run python3 generate.py\ No newline at end of filediff --git a/api-service/app.py b/api-service/app.pyindex ef8225959..c314653e2 100644--- a/api-service/app.py+++ b/api-service/app.py@@ -1,101 +1,109 @@-import os+from typing import Callable, Coroutine, Dict, List, Anyimport uuidimport asyncio+from codegen.callbacks.log_processor import LogProcessor+from codegen.callbacks.logs import OnLogs+from fastapi import FastAPI, WebSocket+from fastapi.middleware.cors import CORSMiddleware+from pydantic import BaseModel-from pprint import pprint-from dotenv import load_dotenv-from quart import Quart, request-from quart_cors import cors-from quart import websocket+from models.base import ModelConfig+from codegen.agent.parsing import Log, ThoughtLog, ToolLog+from database.database import DeploymentState+from run import run_agent-from broker import Broker-from codegen.tools.base import create_tools-from playground_client.exceptions import NotFoundException-from codegen import Codegen-from database import Database, DeploymentState-from session.playground.nodejs import NodeJSPlayground+app = FastAPI(title="e2b-api-service")+app.add_middleware(+ CORSMiddleware,+ allow_origins=["*"],+ allow_credentials=True,+ allow_methods=["*"],+ allow_headers=["*"],+)-load_dotenv()-url = os.environ.get("NEXT_PUBLIC_SUPABASE_URL")-key = os.environ.get("SUPABASE_SERVICE_ROLE_KEY")+class GenerateBody(BaseModel):+ project_id: str+ model_config: ModelConfig-if not url or not key:- raise NotFoundException("Supabase credentials not found")-db = Database(url, key)[email protected]("/agent")+async def generate(body: GenerateBody):+ return {}-app = Quart(__name__)-app.config.from_prefixed_env()-app = cors(app, allow_origin="*")+Notify = Callable[[str, Dict[str, Any]], Coroutine[Any, Any, Any]][email protected]("/health", methods=["GET"])-async def health():- return "OK"+class AgentRun(BaseModel):+ notify: Notify-broker = Broker()+ async def start(self, project_id: str, model_config: Dict[str, Any]):+ run_id = str(uuid.uuid4())+ async def on_logs(logs: List[Log]):+ await self.notify("logs", {"logs": logs})-async def _receive() -> None:- while True:- message = await websocket.receive()- await broker.publish(message)+ log_processor = LogProcessor(on_logs=on_logs)+ async def start_agent():+ await run_agent(+ project_id=project_id,+ run_id=run_id,+ model_config=ModelConfig(**model_config),+ log_processor=log_processor,+ )+ await self.notify("stateUpdate", {"state": DeploymentState.Finished.value})[email protected]("/agent/dev")-async def ws() -> None:- task: asyncio.Task[None] | None = None- try:- task = asyncio.ensure_future(_receive())- async for message in broker.subscribe():- await websocket.send(message)- finally:- if task:- task.cancel()- await task+ asyncio.create_task(start_agent())+ return {"run_id": run_id}-# TODO: SECURITY - Check if user invoking this request has permission to generate and deploy to this project[email protected]("/generate", methods=["POST"])-async def generate():- body = await request.json+async def create_ws_agent_handler(websocket: WebSocket):+ async def notify(method: str, params: Dict[str, Any]):+ await websocket.send_json(+ {+ "jsonrpc": "2.0",+ "method": method,+ "params": params,+ }+ )- run_id = str(uuid.uuid4())- project_id = body["projectID"]- model_config = body["modelConfig"]+ async def call(id: str, method: str, params: List[Any]):+ async def handle_call():+ try:+ if method == "start":+ result = await run.start(*params)+ return {+ "result": result,+ }+ raise Exception(f"Invalid method {method}")+ except Exception as e:+ return {+ "error": {+ "code": 1,+ "message": str(e),+ }+ }++ response = await handle_call()+ await websocket.send_json(+ {+ "jsonrpc": "2.0",+ "id": id,+ **response,+ }+ )- await db.create_deployment(run_id=run_id, project_id=project_id)- playground = None+ run = AgentRun(notify=notify)- try:- # Create playground for the LLM- playground = NodeJSPlayground(get_envs=lambda: db.get_env_vars(project_id))+ async for data in websocket.iter_json():+ await call(data["id"], data["method"], data["params"])- # Create tools- tools = create_tools(- run_id=run_id,- playground=playground,- )+ print("closing")- # Create a new instance of code generator- cg = Codegen(- # The order in which we pass tools HAS an effect on the LLM behaviour.- tools=list(tools),- model_config=model_config,- database=db,- )- # Generate the code- print("Generating...", flush=True)- await cg.generate(run_id=run_id)-- await db.finish_deployment(run_id=run_id)- return {}- except:- await db.update_state(run_id=run_id, state=DeploymentState.Error)- raise- finally:- if playground is not None:- playground.close()[email protected]("/dev/agent")+async def ws_dev_agent(websocket: WebSocket):+ await websocket.accept()+ await create_ws_agent_handler(websocket)diff --git a/api-service/broker.py b/api-service/broker.pydeleted file mode 100644index e7e6caa23..000000000--- a/api-service/broker.py+++ /dev/null@@ -1,22 +0,0 @@-import asyncio-from typing import AsyncGenerator--from quart import Quart--class Broker:- def __init__(self) -> None:- self.connections = set()-- async def publish(self, message: str) -> None:- for connection in self.connections:- await connection.put(message)-- async def subscribe(self) -> AsyncGenerator[str, None]:- connection = asyncio.Queue()- self.connections.add(connection)- try:- while True:- yield await connection.get()- finally:- self.connections.remove(connection)-\ No newline at end of filediff --git a/api-service/codegen/__init__.py b/api-service/codegen/__init__.pyindex ee2367881..e69de29bb 100644--- a/api-service/codegen/__init__.py+++ b/api-service/codegen/__init__.py@@ -1 +0,0 @@-from .codegen import Codegendiff --git a/api-service/codegen/callbacks/log_processor.py b/api-service/codegen/callbacks/log_processor.pynew file mode 100644index 000000000..4ae7db8fd--- /dev/null+++ b/api-service/codegen/callbacks/log_processor.py@@ -0,0 +1,24 @@+from typing import Any, Callable, Coroutine, Generic, TypeVar+from pydantic import BaseModel, PrivateAttr++from codegen.callbacks.log_queue import LogQueue++T = TypeVar("T")+OnLogs = Callable[[T], Coroutine[Any, Any, Any]]+++class LogProcessor(Generic[T]):+ def __init__(self, on_logs: OnLogs[T]) -> None:+ super().__init__()+ self._on_logs = on_logs+ self.log_queue = LogQueue()++ def ingest(self, logs: T):+ task = self._on_logs(logs)+ self.log_queue.add(task)++ async def flush(self):+ await self.log_queue.flush()++ def close(self):+ self.log_queue.close()diff --git a/api-service/codegen/callbacks/log_queue.py b/api-service/codegen/callbacks/log_queue.pyindex 5190b840c..a9a88b37e 100644--- a/api-service/codegen/callbacks/log_queue.py+++ b/api-service/codegen/callbacks/log_queue.py@@ -3,8 +3,7 @@ from typing import Coroutineclass LogQueue:- def __init__(self, interval: float = 0.05) -> None:- self._interval = interval+ def __init__(self) -> None:self._queue: Queue[Coroutine] = Queue()# Start the worker that saves logs from queue to the db.self._worker = ensure_future(self._start())@@ -32,7 +31,6 @@ class LogQueue:async def _start(self):while True:await self._work()- await sleep(self._interval)async def flush(self):await self._queue.join()diff --git a/api-service/codegen/callbacks/logs.py b/api-service/codegen/callbacks/logs.pyindex 284e0c55e..e015600e1 100644--- a/api-service/codegen/callbacks/logs.py+++ b/api-service/codegen/callbacks/logs.py@@ -1,4 +1,5 @@-from typing import Dict, Any, List, Union+from typing import Callable, Coroutine, Dict, Any, List, Union+from codegen.callbacks.log_processor import LogProcessorfrom langchain.callbacks.base import AsyncCallbackHandlerfrom langchain.schema import AgentAction, AgentFinish, LLMResultfrom pydantic import PrivateAttr@@ -9,39 +10,52 @@ from codegen.callbacks.log_parser import LogStreamParserfrom database import Database+OnLogs = Callable[[List[ToolLog | ThoughtLog]], Coroutine[Any, Any, Any]]++class LogsCallbackHandler(AsyncCallbackHandler):_database: Database = PrivateAttr()_run_id: str = PrivateAttr()_raw_logs: str = ""+ _log_processor: LogProcessor = PrivateAttr()def __init__(- self, database: Database, run_id: str, tool_names: List[str], **kwargs: Any+ self,+ database: Database,+ run_id: str,+ tool_names: List[str],+ log_processor: LogProcessor,+ **kwargs: Any,):super().__init__(**kwargs)self._database = databaseself._run_id = run_idself._parser = LogStreamParser(tool_names=tool_names)- self._log_queue = LogQueue()- self._raw_log_queue = LogQueue(1.5)+ self._log_processor = log_processor+ # self._log_queue = LogQueue(on_logs=on_logs)+ # self._raw_log_queue = LogQueue(1.5)def __del__(self):- self._log_queue.close()- self._raw_log_queue.close()+ self._log_processor.close()+ # self._log_queue.close()+ # self._raw_log_queue.close()def _add_and_push_raw_logs(self, new_raw_log: str) -> None:- self._raw_logs += new_raw_log- self._raw_log_queue.add(- self._database.push_raw_logs(self._run_id, self._raw_logs),- )+ pass+ # self._raw_logs += new_raw_log+ # self._raw_log_queue.add(+ # self._database.push_raw_logs(self._run_id, self._raw_logs),+ # )async def _push_logs(self, logs: list[ToolLog | ThoughtLog], flush: bool = False) -> None:- self._log_queue.add(- self._database.push_logs(self._run_id, logs),- )+ self._log_processor.ingest(logs)+ # self._log_queue.add(+ # self._database.push_logs(self._run_id, logs),+ # )if flush:- await self._log_queue.flush()+ await self._log_processor.flush()async def on_llm_start(self, serialized: Dict[str, Any], prompts: List[str], **kwargs: Any@@ -89,8 +103,8 @@ class LogsCallbackHandler(AsyncCallbackHandler):print("Starting tool")self._add_and_push_raw_logs("Starting tool...")- await self._log_queue.flush()- await self._raw_log_queue.flush()+ await self._log_processor.flush()+ # await self._raw_log_queue.flush()async def on_tool_end(self, output: str, **kwargs: Any) -> None:"""Run when tool ends running."""diff --git a/api-service/codegen/codegen.py b/api-service/codegen/codegen.pyindex 0a74365b6..deb12c635 100644--- a/api-service/codegen/codegen.py+++ b/api-service/codegen/codegen.py@@ -6,9 +6,11 @@ from typing import (ClassVar,Sequence,)+from codegen.agent.base import CodegenAgentExecutor+from codegen.callbacks.log_processor import LogProcessorfrom langchain.agents import AgentExecutor, Agent-from langchain.chains.llm import LLMChainfrom langchain.schema import BaseLanguageModel+from models.base import PromptPartfrom pydantic import BaseModel, PrivateAttrfrom langchain.callbacks.base import (AsyncCallbackManager,@@ -17,18 +19,12 @@ from langchain.callbacks.base import (from langchain.callbacks.streaming_stdout import StreamingStdOutCallbackHandlerfrom langchain.tools import BaseTool-from codegen.callbacks.logs import LogsCallbackHandler+from codegen.callbacks.logs import LogsCallbackHandler, OnLogsfrom models import get_model, ModelConfigfrom database import Databasefrom codegen.agent import CodegenAgent-class PromptPart(TypedDict):- role: Literal["user", "system"]- type: str- content: str--class Codegen(BaseModel):input_variables: ClassVar[List[str]] = ["input", "agent_scratchpad"]_agent: Agent = PrivateAttr()@@ -38,18 +34,21 @@ class Codegen(BaseModel):_database: Database = PrivateAttr()_prompt: List[PromptPart] = PrivateAttr()_callback_manager: BaseCallbackManager = PrivateAttr()+ _log_processor: LogProcessor = PrivateAttr()def __init__(self,database: Database,tools: Sequence[BaseTool],model_config: ModelConfig,+ log_processor: LogProcessor,**kwargs: Any,) -> None:super().__init__(**kwargs)self._database = databaseself._tools = tools- self._prompt = model_config["prompt"]+ self._prompt = model_config.prompt+ self._log_processor = log_processorself._callback_manager = AsyncCallbackManager([StreamingStdOutCallbackHandler()]@@ -62,45 +61,24 @@ class Codegen(BaseModel):# Create the LLMself._llm = get_model(model_config, self._callback_manager)- print(- f"Using LLM '{model_config['provider']}' with args:\n{model_config['args']}"- )-- # prompt = cls.create_prompt(- # tools,- # prefix=prefix,- # suffix=suffix,- # format_instructions=format_instructions,- # input_variables=input_variables,- # )+ print(f"Using LLM '{model_config.provider}' with args:\n{model_config.args}")- #-- llm_chain = LLMChain(+ self._agent = CodegenAgent.from_llm_and_tools(llm=self._llm,- prompt=prompt,+ tools=tools,+ prefix=self.get_prompt_part("system", "prefix"),+ format_instructions=self.get_prompt_part("system", "suffix"),+ suffix="",+ input_variables=Codegen.input_variables,callback_manager=self._callback_manager,)- # # Create CodegenAgent- # self._agent = CodegenAgent.from_llm_and_tools(- # llm=self._llm,- # tools=tools,- # prefix=self.get_prompt_part("system", "prefix"),- # format_instructions=self.get_prompt_part("system", "suffix"),- # suffix="",- # input_variables=Codegen.input_variables,- # callback_manager=self._callback_manager,- # )-- # self._agent_executor = CodegenAgentExecutor.from_agent_and_tools(- # agent=self._agent,- # tools=self._tools,- # verbose=True,- # callback_manager=self._callback_manager,- # )-- # remove agent executor+ self._agent_executor = CodegenAgentExecutor.from_agent_and_tools(+ agent=self._agent,+ tools=self._tools,+ verbose=True,+ callback_manager=self._callback_manager,+ )def tool_names(self):return [tool.name for tool in self._tools]@@ -111,14 +89,36 @@ class Codegen(BaseModel):(promptfor prompt in self._prompt- if prompt["role"] == role and prompt["type"] == type+ if prompt.role == role and prompt.type == type),- )["content"]+ ).content++ # async def rewrite_history(self):+ # self._chain.++ # async def cancel(self):++ # async def pause(self):++ # async def resume(self):++ # async def start(self, run_id: str):+ # self._callback_manager.add_handler(+ # LogsCallbackHandler(+ # database=self._database,+ # run_id=run_id,+ # tool_names=self.tool_names(),+ # )+ # )++ # while not self._cancelled:+ # yield self._llm.agenerate_prompt()async def generate(self, run_id: str):self._callback_manager.add_handler(LogsCallbackHandler(database=self._database,+ log_processor=self._log_processor,run_id=run_id,tool_names=self.tool_names(),)diff --git a/api-service/database/__init__.py b/api-service/database/__init__.pyindex 56a4d9a6c..2370a30f2 100644--- a/api-service/database/__init__.py+++ b/api-service/database/__init__.py@@ -1 +1,2 @@-from .database import Database, DeploymentState+from .base import db+from .database import Databasediff --git a/api-service/database/base.py b/api-service/database/base.pynew file mode 100644index 000000000..f0e7469d4--- /dev/null+++ b/api-service/database/base.py@@ -0,0 +1,15 @@+import os+from dotenv import load_dotenv++from .database import Database+from playground_client.exceptions import NotFoundException++load_dotenv()++url = os.environ.get("NEXT_PUBLIC_SUPABASE_URL")+key = os.environ.get("SUPABASE_SERVICE_ROLE_KEY")++if not url or not key:+ raise NotFoundException("Supabase credentials not found")++db = Database(url, key)diff --git a/api-service/generate.py b/api-service/generate.pynew file mode 100644index 000000000..0f1ab34f6--- /dev/null+++ b/api-service/generate.py@@ -0,0 +1,18 @@+# Script for generating and saving OpenAPI schema++from fastapi.openapi.utils import get_openapi+from app import app+import json++with open("openapi.json", "w") as f:+ json.dump(+ get_openapi(+ title=app.title,+ version=app.version,+ openapi_version=app.openapi_version,+ description=app.description,+ routes=app.routes,+ ),+ f,+ indent=2,+ )diff --git a/api-service/models/base.py b/api-service/models/base.pyindex 8a5b5de55..29077ac4c 100644--- a/api-service/models/base.py+++ b/api-service/models/base.py@@ -1,10 +1,10 @@-from typing import TypedDict, Dict, Any, List+from typing import Dict, Any, List, Literalfrom enum import Enum-from codegen.codegen import PromptPartfrom langchain.chat_models import ChatOpenAI-from langchain.llms import Anthropic, HuggingFaceEndpoint+from langchain.llms import Anthropicfrom langchain.schema import BaseLanguageModelfrom langchain.callbacks.base import BaseCallbackManager+from pydantic import BaseModelfrom .providers.replicate import ReplicateFixfrom .providers.hugging_face import HuggingFaceHubFix, HuggingFaceEndpointFix@@ -19,7 +19,13 @@ class ModelProvider(Enum):Banana = "Banana"-class ModelConfig(TypedDict):+class PromptPart(BaseModel):+ role: Literal["user", "system"]+ type: str+ content: str+++class ModelConfig(BaseModel):# Provider is string and not ModelProvider because we deserialize it form request's JSON bodyprovider: strprompt: List[PromptPart]@@ -30,17 +36,17 @@ def get_model(config: ModelConfig,callback_manager: BaseCallbackManager,) -> BaseLanguageModel:- match config["provider"]:+ match config.provider:case ModelProvider.Anthropic.value:return Anthropic(- **config["args"],+ **config.args,verbose=True,streaming=True,callback_manager=callback_manager,)case ModelProvider.OpenAI.value:return ChatOpenAI(- **config["args"],+ **config.args,request_timeout=3600,verbose=True,streaming=True,@@ -48,32 +54,32 @@ def get_model()case ModelProvider.Replicate.value:return ReplicateFix(- model=config["args"]["model"],- replicate_api_token=config["args"]["replicate_api_token"],- model_kwargs=config["args"],+ model=config.args["model"],+ replicate_api_token=config.args["replicate_api_token"],+ model_kwargs=config.args,verbose=True,callback_manager=callback_manager,)case ModelProvider.HuggingFace.value:- if config["args"].get("endpoint_url"):+ if config.args.get("endpoint_url"):return HuggingFaceEndpointFix(- huggingfacehub_api_token=config["args"]["huggingfacehub_api_token"],- endpoint_url=config["args"]["endpoint_url"],+ huggingfacehub_api_token=config.args["huggingfacehub_api_token"],+ endpoint_url=config.args["endpoint_url"],verbose=True,model_kwargs={- **config["args"],+ **config.args,"huggingfacehub_api_token": None,"endpoint_url": None,},callback_manager=callback_manager,task="text-generation",)- elif config["args"].get("repo_id"):+ elif config.args.get("repo_id"):return HuggingFaceHubFix(- huggingfacehub_api_token=config["args"]["huggingfacehub_api_token"],- repo_id=config["args"]["repo_id"],+ huggingfacehub_api_token=config.args["huggingfacehub_api_token"],+ repo_id=config.args["repo_id"],model_kwargs={- **config["args"],+ **config.args,"huggingfacehub_api_token": None,"repo_id": None,},@@ -85,11 +91,11 @@ def get_model()case ModelProvider.Banana.value:return BananaFix(- model_key=config["args"]["model_key"],- banana_api_key=config["args"]["banana_api_key"],- model_kwargs=config["args"],+ model_key=config.args["model_key"],+ banana_api_key=config.args["banana_api_key"],+ model_kwargs=config.args,verbose=True,callback_manager=callback_manager,)case _:- raise ValueError(f"Provider {config['provider']} no found.")+ raise ValueError(f"Provider {config.provider} no found.")diff --git a/api-service/openapi.json b/api-service/openapi.jsonnew file mode 100644index 000000000..dbc8b391b--- /dev/null+++ b/api-service/openapi.json@@ -0,0 +1,165 @@+{+ "openapi": "3.0.2",+ "info": {+ "title": "e2b-api-service",+ "version": "0.1.0"+ },+ "paths": {+ "/agent": {+ "post": {+ "summary": "Generate",+ "operationId": "generate_agent_post",+ "requestBody": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/GenerateBody"+ }+ }+ },+ "required": true+ },+ "responses": {+ "200": {+ "description": "Successful Response",+ "content": {+ "application/json": {+ "schema": {}+ }+ }+ },+ "422": {+ "description": "Validation Error",+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/HTTPValidationError"+ }+ }+ }+ }+ }+ }+ }+ },+ "components": {+ "schemas": {+ "GenerateBody": {+ "title": "GenerateBody",+ "required": [+ "project_id",+ "model_config"+ ],+ "type": "object",+ "properties": {+ "project_id": {+ "title": "Project Id",+ "type": "string"+ },+ "model_config": {+ "$ref": "#/components/schemas/ModelConfig"+ }+ }+ },+ "HTTPValidationError": {+ "title": "HTTPValidationError",+ "type": "object",+ "properties": {+ "detail": {+ "title": "Detail",+ "type": "array",+ "items": {+ "$ref": "#/components/schemas/ValidationError"+ }+ }+ }+ },+ "ModelConfig": {+ "title": "ModelConfig",+ "required": [+ "provider",+ "prompt",+ "args"+ ],+ "type": "object",+ "properties": {+ "provider": {+ "title": "Provider",+ "type": "string"+ },+ "prompt": {+ "title": "Prompt",+ "type": "array",+ "items": {+ "$ref": "#/components/schemas/PromptPart"+ }+ },+ "args": {+ "title": "Args",+ "type": "object"+ }+ }+ },+ "PromptPart": {+ "title": "PromptPart",+ "required": [+ "role",+ "type",+ "content"+ ],+ "type": "object",+ "properties": {+ "role": {+ "title": "Role",+ "enum": [+ "user",+ "system"+ ],+ "type": "string"+ },+ "type": {+ "title": "Type",+ "type": "string"+ },+ "content": {+ "title": "Content",+ "type": "string"+ }+ }+ },+ "ValidationError": {+ "title": "ValidationError",+ "required": [+ "loc",+ "msg",+ "type"+ ],+ "type": "object",+ "properties": {+ "loc": {+ "title": "Location",+ "type": "array",+ "items": {+ "anyOf": [+ {+ "type": "string"+ },+ {+ "type": "integer"+ }+ ]+ }+ },+ "msg": {+ "title": "Message",+ "type": "string"+ },+ "type": {+ "title": "Error Type",+ "type": "string"+ }+ }+ }+ }+ }+}\ No newline at end of filediff --git a/api-service/poetry.lock b/api-service/poetry.lockindex 2518bd6e1..22ca61ce4 100644--- a/api-service/poetry.lock+++ b/api-service/poetry.lock@@ -13,18 +13,6 @@ files = [{file = "aenum-3.1.12.tar.gz", hash = "sha256:3e531c91860a81f885f7e6e97d219ae9772cb899580084788935dad7d9742ef0"},]-[[package]]-name = "aiofiles"-version = "23.1.0"-description = "File support for asyncio."-category = "main"-optional = false-python-versions = ">=3.7,<4.0"-files = [- {file = "aiofiles-23.1.0-py3-none-any.whl", hash = "sha256:9312414ae06472eb6f1d163f555e466a23aed1c8f60c30cccf7121dba2e53eb2"},- {file = "aiofiles-23.1.0.tar.gz", hash = "sha256:edd247df9a19e0db16534d4baaf536d6609a43e1de5401d7a4c1c148753a1635"},-]-[[package]]name = "aiohttp"version = "3.8.4"@@ -251,18 +239,6 @@ files = [[package.dependencies]requests = ">=2.26.0,<3.0.0"-[[package]]-name = "blinker"-version = "1.5"-description = "Fast, simple object-to-object and broadcast signaling"-category = "main"-optional = false-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"-files = [- {file = "blinker-1.5-py2.py3-none-any.whl", hash = "sha256:1eb563df6fdbc39eeddc177d953203f99f097e9bf0e2b8f9f3cf18b6ca425e36"},- {file = "blinker-1.5.tar.gz", hash = "sha256:923e5e2f69c155f2cc42dafbbd70e16e3fde24d2d4aa2ab72fbe386238892462"},-]-[[package]]name = "cachetools"version = "5.3.0"@@ -376,7 +352,7 @@ files = [name = "click"version = "8.1.3"description = "Composable command line interface toolkit"-category = "main"+category = "dev"optional = falsepython-versions = ">=3.7"files = [@@ -449,6 +425,28 @@ files = [[package.extras]test = ["pytest (>=6)"]+[[package]]+name = "fastapi"+version = "0.95.1"+description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production"+category = "main"+optional = false+python-versions = ">=3.7"+files = [+ {file = "fastapi-0.95.1-py3-none-any.whl", hash = "sha256:a870d443e5405982e1667dfe372663abf10754f246866056336d7f01c21dab07"},+ {file = "fastapi-0.95.1.tar.gz", hash = "sha256:9569f0a381f8a457ec479d90fa01005cfddaae07546eb1f3fa035bc4797ae7d5"},+]++[package.dependencies]+pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0"+starlette = ">=0.26.1,<0.27.0"++[package.extras]+all = ["email-validator (>=1.1.1)", "httpx (>=0.23.0)", "itsdangerous (>=1.1.0)", "jinja2 (>=2.11.2)", "orjson (>=3.2.1)", "python-multipart (>=0.0.5)", "pyyaml (>=5.3.1)", "ujson (>=4.0.1,!=4.0.2,!=4.1.0,!=4.2.0,!=4.3.0,!=5.0.0,!=5.1.0)", "uvicorn[standard] (>=0.12.0)"]+dev = ["pre-commit (>=2.17.0,<3.0.0)", "ruff (==0.0.138)", "uvicorn[standard] (>=0.12.0,<0.21.0)"]+doc = ["mdx-include (>=1.4.1,<2.0.0)", "mkdocs (>=1.1.2,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "mkdocs-material (>=8.1.4,<9.0.0)", "pyyaml (>=5.3.1,<7.0.0)", "typer-cli (>=0.0.13,<0.0.14)", "typer[all] (>=0.6.1,<0.8.0)"]+test = ["anyio[trio] (>=3.2.1,<4.0.0)", "black (==23.1.0)", "coverage[toml] (>=6.5.0,<8.0)", "databases[sqlite] (>=0.3.2,<0.7.0)", "email-validator (>=1.1.1,<2.0.0)", "flask (>=1.1.2,<3.0.0)", "httpx (>=0.23.0,<0.24.0)", "isort (>=5.0.6,<6.0.0)", "mypy (==0.982)", "orjson (>=3.2.1,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "peewee (>=3.13.3,<4.0.0)", "pytest (>=7.1.3,<8.0.0)", "python-jose[cryptography] (>=3.3.0,<4.0.0)", "python-multipart (>=0.0.5,<0.0.7)", "pyyaml (>=5.3.1,<7.0.0)", "ruff (==0.0.138)", "sqlalchemy (>=1.3.18,<1.4.43)", "types-orjson (==3.6.2)", "types-ujson (==5.7.0.1)", "ujson (>=4.0.1,!=4.0.2,!=4.1.0,!=4.2.0,!=4.3.0,!=5.0.0,!=5.1.0,<6.0.0)"]+[[package]]name = "filelock"version = "3.12.0"@@ -551,14 +549,14 @@ files = [[[package]]name = "gptcache"-version = "0.1.18"+version = "0.1.19"description = "GPTCache, a powerful caching library that can be used to speed up and lower the cost of chat applications that rely on the LLM service. GPTCache works as a memcache for AIGC applications, similar to how Redis works for traditional applications."category = "main"optional = falsepython-versions = ">=3.8.1"files = [- {file = "gptcache-0.1.18-py3-none-any.whl", hash = "sha256:0f6a4820812df68c85fb34a74d8501ad7ee039a595c1eb2bc573e352dfea81c3"},- {file = "gptcache-0.1.18.tar.gz", hash = "sha256:86a80865d72822f202e824f6ee8b1fa716bd3f592e9d14faa8cdf30d7cf642aa"},+ {file = "gptcache-0.1.19-py3-none-any.whl", hash = "sha256:d225050e67cd3c5cf8d604e84fc7e12257463cc3b8b22259d9021d032736be31"},+ {file = "gptcache-0.1.19.tar.gz", hash = "sha256:6d7cbc4105354575385fec0efc18a6e5d4262e290c6b7b0d000ff741a82799de"},][package.dependencies]@@ -678,7 +676,7 @@ files = [name = "h2"version = "4.1.0"description = "HTTP/2 State-Machine based protocol implementation"-category = "main"+category = "dev"optional = falsepython-versions = ">=3.6.1"files = [@@ -694,7 +692,7 @@ hyperframe = ">=6.0,<7"name = "hpack"version = "4.0.0"description = "Pure-Python HPACK header compression"-category = "main"+category = "dev"optional = falsepython-versions = ">=3.6.1"files = [@@ -837,7 +835,7 @@ typing = ["types-PyYAML", "types-requests", "types-simplejson", "types-toml", "tname = "hypercorn"version = "0.14.3"description = "A ASGI Server based on Hyper libraries and inspired by Gunicorn"-category = "main"+category = "dev"optional = falsepython-versions = ">=3.7"files = [@@ -862,7 +860,7 @@ uvloop = ["uvloop"]name = "hyperframe"version = "6.0.1"description = "HTTP/2 framing layer for Python"-category = "main"+category = "dev"optional = falsepython-versions = ">=3.6.1"files = [@@ -894,36 +892,6 @@ files = [{file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},]-[[package]]-name = "itsdangerous"-version = "2.1.2"-description = "Safely pass data to untrusted environments and back."-category = "main"-optional = false-python-versions = ">=3.7"-files = [- {file = "itsdangerous-2.1.2-py3-none-any.whl", hash = "sha256:2c2349112351b88699d8d4b6b075022c0808887cb7ad10069318a8b0bc88db44"},- {file = "itsdangerous-2.1.2.tar.gz", hash = "sha256:5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a"},-]--[[package]]-name = "jinja2"-version = "3.1.2"-description = "A very fast and expressive template engine."-category = "main"-optional = false-python-versions = ">=3.7"-files = [- {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},- {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},-]--[package.dependencies]-MarkupSafe = ">=2.0"--[package.extras]-i18n = ["Babel (>=2.7)"]-[[package]]name = "langchain"version = "0.0.141"@@ -1049,66 +1017,6 @@ html5 = ["html5lib"]htmlsoup = ["BeautifulSoup4"]source = ["Cython (>=0.29.7)"]-[[package]]-name = "markupsafe"-version = "2.1.2"-description = "Safely add untrusted strings to HTML/XML markup."-category = "main"-optional = false-python-versions = ">=3.7"-files = [- {file = "MarkupSafe-2.1.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:665a36ae6f8f20a4676b53224e33d456a6f5a72657d9c83c2aa00765072f31f7"},- {file = "MarkupSafe-2.1.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:340bea174e9761308703ae988e982005aedf427de816d1afe98147668cc03036"},- {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22152d00bf4a9c7c83960521fc558f55a1adbc0631fbb00a9471e097b19d72e1"},- {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28057e985dace2f478e042eaa15606c7efccb700797660629da387eb289b9323"},- {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca244fa73f50a800cf8c3ebf7fd93149ec37f5cb9596aa8873ae2c1d23498601"},- {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d9d971ec1e79906046aa3ca266de79eac42f1dbf3612a05dc9368125952bd1a1"},- {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7e007132af78ea9df29495dbf7b5824cb71648d7133cf7848a2a5dd00d36f9ff"},- {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7313ce6a199651c4ed9d7e4cfb4aa56fe923b1adf9af3b420ee14e6d9a73df65"},- {file = "MarkupSafe-2.1.2-cp310-cp310-win32.whl", hash = "sha256:c4a549890a45f57f1ebf99c067a4ad0cb423a05544accaf2b065246827ed9603"},- {file = "MarkupSafe-2.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:835fb5e38fd89328e9c81067fd642b3593c33e1e17e2fdbf77f5676abb14a156"},- {file = "MarkupSafe-2.1.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2ec4f2d48ae59bbb9d1f9d7efb9236ab81429a764dedca114f5fdabbc3788013"},- {file = "MarkupSafe-2.1.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:608e7073dfa9e38a85d38474c082d4281f4ce276ac0010224eaba11e929dd53a"},- {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:65608c35bfb8a76763f37036547f7adfd09270fbdbf96608be2bead319728fcd"},- {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f2bfb563d0211ce16b63c7cb9395d2c682a23187f54c3d79bfec33e6705473c6"},- {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:da25303d91526aac3672ee6d49a2f3db2d9502a4a60b55519feb1a4c7714e07d"},- {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:9cad97ab29dfc3f0249b483412c85c8ef4766d96cdf9dcf5a1e3caa3f3661cf1"},- {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:085fd3201e7b12809f9e6e9bc1e5c96a368c8523fad5afb02afe3c051ae4afcc"},- {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1bea30e9bf331f3fef67e0a3877b2288593c98a21ccb2cf29b74c581a4eb3af0"},- {file = "MarkupSafe-2.1.2-cp311-cp311-win32.whl", hash = "sha256:7df70907e00c970c60b9ef2938d894a9381f38e6b9db73c5be35e59d92e06625"},- {file = "MarkupSafe-2.1.2-cp311-cp311-win_amd64.whl", hash = "sha256:e55e40ff0cc8cc5c07996915ad367fa47da6b3fc091fdadca7f5403239c5fec3"},- {file = "MarkupSafe-2.1.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a6e40afa7f45939ca356f348c8e23048e02cb109ced1eb8420961b2f40fb373a"},- {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cf877ab4ed6e302ec1d04952ca358b381a882fbd9d1b07cccbfd61783561f98a"},- {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63ba06c9941e46fa389d389644e2d8225e0e3e5ebcc4ff1ea8506dce646f8c8a"},- {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f1cd098434e83e656abf198f103a8207a8187c0fc110306691a2e94a78d0abb2"},- {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:55f44b440d491028addb3b88f72207d71eeebfb7b5dbf0643f7c023ae1fba619"},- {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:a6f2fcca746e8d5910e18782f976489939d54a91f9411c32051b4aab2bd7c513"},- {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:0b462104ba25f1ac006fdab8b6a01ebbfbce9ed37fd37fd4acd70c67c973e460"},- {file = "MarkupSafe-2.1.2-cp37-cp37m-win32.whl", hash = "sha256:7668b52e102d0ed87cb082380a7e2e1e78737ddecdde129acadb0eccc5423859"},- {file = "MarkupSafe-2.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:6d6607f98fcf17e534162f0709aaad3ab7a96032723d8ac8750ffe17ae5a0666"},- {file = "MarkupSafe-2.1.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a806db027852538d2ad7555b203300173dd1b77ba116de92da9afbc3a3be3eed"},- {file = "MarkupSafe-2.1.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a4abaec6ca3ad8660690236d11bfe28dfd707778e2442b45addd2f086d6ef094"},- {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f03a532d7dee1bed20bc4884194a16160a2de9ffc6354b3878ec9682bb623c54"},- {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4cf06cdc1dda95223e9d2d3c58d3b178aa5dacb35ee7e3bbac10e4e1faacb419"},- {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22731d79ed2eb25059ae3df1dfc9cb1546691cc41f4e3130fe6bfbc3ecbbecfa"},- {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f8ffb705ffcf5ddd0e80b65ddf7bed7ee4f5a441ea7d3419e861a12eaf41af58"},- {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8db032bf0ce9022a8e41a22598eefc802314e81b879ae093f36ce9ddf39ab1ba"},- {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2298c859cfc5463f1b64bd55cb3e602528db6fa0f3cfd568d3605c50678f8f03"},- {file = "MarkupSafe-2.1.2-cp38-cp38-win32.whl", hash = "sha256:50c42830a633fa0cf9e7d27664637532791bfc31c731a87b202d2d8ac40c3ea2"},- {file = "MarkupSafe-2.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:bb06feb762bade6bf3c8b844462274db0c76acc95c52abe8dbed28ae3d44a147"},- {file = "MarkupSafe-2.1.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:99625a92da8229df6d44335e6fcc558a5037dd0a760e11d84be2260e6f37002f"},- {file = "MarkupSafe-2.1.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8bca7e26c1dd751236cfb0c6c72d4ad61d986e9a41bbf76cb445f69488b2a2bd"},- {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:40627dcf047dadb22cd25ea7ecfe9cbf3bbbad0482ee5920b582f3809c97654f"},- {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40dfd3fefbef579ee058f139733ac336312663c6706d1163b82b3003fb1925c4"},- {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:090376d812fb6ac5f171e5938e82e7f2d7adc2b629101cec0db8b267815c85e2"},- {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:2e7821bffe00aa6bd07a23913b7f4e01328c3d5cc0b40b36c0bd81d362faeb65"},- {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:c0a33bc9f02c2b17c3ea382f91b4db0e6cde90b63b296422a939886a7a80de1c"},- {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b8526c6d437855442cdd3d87eede9c425c4445ea011ca38d937db299382e6fa3"},- {file = "MarkupSafe-2.1.2-cp39-cp39-win32.whl", hash = "sha256:137678c63c977754abe9086a3ec011e8fd985ab90631145dfb9294ad09c102a7"},- {file = "MarkupSafe-2.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:0576fe974b40a400449768941d5d0858cc624e3249dfd1e0c33674e5c7ca7aed"},- {file = "MarkupSafe-2.1.2.tar.gz", hash = "sha256:abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d"},-]-[[package]]name = "marshmallow"version = "3.19.0"@@ -1367,7 +1275,7 @@ strenum = ">=0.4.9,<0.5.0"name = "priority"version = "2.0.0"description = "A pure-Python implementation of the HTTP/2 priority tree"-category = "main"+category = "dev"optional = falsepython-versions = ">=3.6.1"files = [@@ -1531,47 +1439,6 @@ files = [{file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},]-[[package]]-name = "quart"-version = "0.18.4"-description = "A Python ASGI web microframework with the same API as Flask"-category = "main"-optional = false-python-versions = ">=3.7"-files = [- {file = "quart-0.18.4-py3-none-any.whl", hash = "sha256:578a466bcd8c58b947b384ca3517c2a2f3bfeec8f58f4ff5038d4506ffee6be7"},- {file = "quart-0.18.4.tar.gz", hash = "sha256:c1766f269cdb85daf9da67ba54170abf7839aca97304dcb4cd0778eabfb442c6"},-]--[package.dependencies]-aiofiles = "*"-blinker = "<1.6"-click = ">=8.0.0"-hypercorn = ">=0.11.2"-itsdangerous = "*"-jinja2 = "*"-markupsafe = "*"-werkzeug = ">=2.2.0"--[package.extras]-docs = ["pydata_sphinx_theme"]-dotenv = ["python-dotenv"]--[[package]]-name = "quart-cors"-version = "0.6.0"-description = "A Quart extension to provide Cross Origin Resource Sharing, access control, support"-category = "main"-optional = false-python-versions = ">=3.7"-files = [- {file = "quart_cors-0.6.0-py3-none-any.whl", hash = "sha256:a12cb8f82506be9794c7d0fba62be04f07ca719e47e0691bf7a63d5ce661b70e"},- {file = "quart_cors-0.6.0.tar.gz", hash = "sha256:e7c3f176624cfaa934ea96eddbcaea0b6c225d8eee543f97bce3bdc22e1e00ef"},-]--[package.dependencies]-quart = ">=0.15"-[[package]]name = "replicate"version = "0.8.1"@@ -1747,6 +1614,24 @@ postgresql-psycopg2cffi = ["psycopg2cffi"]pymysql = ["pymysql", "pymysql (<1)"]sqlcipher = ["sqlcipher3-binary"]+[[package]]+name = "starlette"+version = "0.26.1"+description = "The little ASGI library that shines."+category = "main"+optional = false+python-versions = ">=3.7"+files = [+ {file = "starlette-0.26.1-py3-none-any.whl", hash = "sha256:e87fce5d7cbdde34b76f0ac69013fd9d190d581d80681493016666e6f96c6d5e"},+ {file = "starlette-0.26.1.tar.gz", hash = "sha256:41da799057ea8620e4667a3e69a5b1923ebd32b1819c8fa75634bbe8d8bea9bd"},+]++[package.dependencies]+anyio = ">=3.4.0,<5"++[package.extras]+full = ["httpx (>=0.22.0)", "itsdangerous", "jinja2", "python-multipart", "pyyaml"]+[[package]]name = "strenum"version = "0.4.10"@@ -1838,7 +1723,7 @@ testing = ["black (==22.3)", "datasets", "numpy", "pytest", "requests"]name = "toml"version = "0.10.2"description = "Python Library for Tom's Obvious, Minimal Language"-category = "main"+category = "dev"optional = falsepython-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"files = [@@ -2032,107 +1917,88 @@ anyio = ">=3.0.0"[[package]]name = "websockets"-version = "11.0.2"+version = "10.4"description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)"category = "dev"optional = falsepython-versions = ">=3.7"files = [- {file = "websockets-11.0.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:580cc95c58118f8c39106be71e24d0b7e1ad11a155f40a2ee687f99b3e5e432e"},- {file = "websockets-11.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:143782041e95b63083b02107f31cda999f392903ae331de1307441f3a4557d51"},- {file = "websockets-11.0.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8df63dcd955eb6b2e371d95aacf8b7c535e482192cff1b6ce927d8f43fb4f552"},- {file = "websockets-11.0.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ca9b2dced5cbbc5094678cc1ec62160f7b0fe4defd601cd28a36fde7ee71bbb5"},- {file = "websockets-11.0.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e0eeeea3b01c97fd3b5049a46c908823f68b59bf0e18d79b231d8d6764bc81ee"},- {file = "websockets-11.0.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:502683c5dedfc94b9f0f6790efb26aa0591526e8403ad443dce922cd6c0ec83b"},- {file = "websockets-11.0.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d3cc3e48b6c9f7df8c3798004b9c4b92abca09eeea5e1b0a39698f05b7a33b9d"},- {file = "websockets-11.0.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:808b8a33c961bbd6d33c55908f7c137569b09ea7dd024bce969969aa04ecf07c"},- {file = "websockets-11.0.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:34a6f8996964ccaa40da42ee36aa1572adcb1e213665e24aa2f1037da6080909"},- {file = "websockets-11.0.2-cp310-cp310-win32.whl", hash = "sha256:8f24cd758cbe1607a91b720537685b64e4d39415649cac9177cd1257317cf30c"},- {file = "websockets-11.0.2-cp310-cp310-win_amd64.whl", hash = "sha256:3b87cd302f08ea9e74fdc080470eddbed1e165113c1823fb3ee6328bc40ca1d3"},- {file = "websockets-11.0.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:3565a8f8c7bdde7c29ebe46146bd191290413ee6f8e94cf350609720c075b0a1"},- {file = "websockets-11.0.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f97e03d4d5a4f0dca739ea274be9092822f7430b77d25aa02da6775e490f6846"},- {file = "websockets-11.0.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:8f392587eb2767afa8a34e909f2fec779f90b630622adc95d8b5e26ea8823cb8"},- {file = "websockets-11.0.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7742cd4524622cc7aa71734b51294644492a961243c4fe67874971c4d3045982"},- {file = "websockets-11.0.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:46dda4bc2030c335abe192b94e98686615f9274f6b56f32f2dd661fb303d9d12"},- {file = "websockets-11.0.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d6b2bfa1d884c254b841b0ff79373b6b80779088df6704f034858e4d705a4802"},- {file = "websockets-11.0.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:1df2413266bf48430ef2a752c49b93086c6bf192d708e4a9920544c74cd2baa6"},- {file = "websockets-11.0.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:cf45d273202b0c1cec0f03a7972c655b93611f2e996669667414557230a87b88"},- {file = "websockets-11.0.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3a09cce3dacb6ad638fdfa3154d9e54a98efe7c8f68f000e55ca9c716496ca67"},- {file = "websockets-11.0.2-cp311-cp311-win32.whl", hash = "sha256:2174a75d579d811279855df5824676d851a69f52852edb0e7551e0eeac6f59a4"},- {file = "websockets-11.0.2-cp311-cp311-win_amd64.whl", hash = "sha256:c78ca3037a954a4209b9f900e0eabbc471fb4ebe96914016281df2c974a93e3e"},- {file = "websockets-11.0.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3a2100b02d1aaf66dc48ff1b2a72f34f6ebc575a02bc0350cc8e9fbb35940166"},- {file = "websockets-11.0.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dca9708eea9f9ed300394d4775beb2667288e998eb6f542cdb6c02027430c599"},- {file = "websockets-11.0.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:320ddceefd2364d4afe6576195201a3632a6f2e6d207b0c01333e965b22dbc84"},- {file = "websockets-11.0.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b2a573c8d71b7af937852b61e7ccb37151d719974146b5dc734aad350ef55a02"},- {file = "websockets-11.0.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:13bd5bebcd16a4b5e403061b8b9dcc5c77e7a71e3c57e072d8dff23e33f70fba"},- {file = "websockets-11.0.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:95c09427c1c57206fe04277bf871b396476d5a8857fa1b99703283ee497c7a5d"},- {file = "websockets-11.0.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:2eb042734e710d39e9bc58deab23a65bd2750e161436101488f8af92f183c239"},- {file = "websockets-11.0.2-cp37-cp37m-win32.whl", hash = "sha256:5875f623a10b9ba154cb61967f940ab469039f0b5e61c80dd153a65f024d9fb7"},- {file = "websockets-11.0.2-cp37-cp37m-win_amd64.whl", hash = "sha256:634239bc844131863762865b75211a913c536817c0da27f691400d49d256df1d"},- {file = "websockets-11.0.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:3178d965ec204773ab67985a09f5696ca6c3869afeed0bb51703ea404a24e975"},- {file = "websockets-11.0.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:955fcdb304833df2e172ce2492b7b47b4aab5dcc035a10e093d911a1916f2c87"},- {file = "websockets-11.0.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cb46d2c7631b2e6f10f7c8bac7854f7c5e5288f024f1c137d4633c79ead1e3c0"},- {file = "websockets-11.0.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25aae96c1060e85836552a113495db6d857400288161299d77b7b20f2ac569f2"},- {file = "websockets-11.0.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2abeeae63154b7f63d9f764685b2d299e9141171b8b896688bd8baec6b3e2303"},- {file = "websockets-11.0.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:daa1e8ea47507555ed7a34f8b49398d33dff5b8548eae3de1dc0ef0607273a33"},- {file = "websockets-11.0.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:954eb789c960fa5daaed3cfe336abc066941a5d456ff6be8f0e03dd89886bb4c"},- {file = "websockets-11.0.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:3ffe251a31f37e65b9b9aca5d2d67fd091c234e530f13d9dce4a67959d5a3fba"},- {file = "websockets-11.0.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:adf6385f677ed2e0b021845b36f55c43f171dab3a9ee0ace94da67302f1bc364"},- {file = "websockets-11.0.2-cp38-cp38-win32.whl", hash = "sha256:aa7b33c1fb2f7b7b9820f93a5d61ffd47f5a91711bc5fa4583bbe0c0601ec0b2"},- {file = "websockets-11.0.2-cp38-cp38-win_amd64.whl", hash = "sha256:220d5b93764dd70d7617f1663da64256df7e7ea31fc66bc52c0e3750ee134ae3"},- {file = "websockets-11.0.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:0fb4480556825e4e6bf2eebdbeb130d9474c62705100c90e59f2f56459ddab42"},- {file = "websockets-11.0.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ec00401846569aaf018700249996143f567d50050c5b7b650148989f956547af"},- {file = "websockets-11.0.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:87c69f50281126dcdaccd64d951fb57fbce272578d24efc59bce72cf264725d0"},- {file = "websockets-11.0.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:232b6ba974f5d09b1b747ac232f3a3d8f86de401d7b565e837cc86988edf37ac"},- {file = "websockets-11.0.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:392d409178db1e46d1055e51cc850136d302434e12d412a555e5291ab810f622"},- {file = "websockets-11.0.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a4fe2442091ff71dee0769a10449420fd5d3b606c590f78dd2b97d94b7455640"},- {file = "websockets-11.0.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ede13a6998ba2568b21825809d96e69a38dc43184bdeebbde3699c8baa21d015"},- {file = "websockets-11.0.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:4c54086b2d2aec3c3cb887ad97e9c02c6be9f1d48381c7419a4aa932d31661e4"},- {file = "websockets-11.0.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:e37a76ccd483a6457580077d43bc3dfe1fd784ecb2151fcb9d1c73f424deaeba"},- {file = "websockets-11.0.2-cp39-cp39-win32.whl", hash = "sha256:d1881518b488a920434a271a6e8a5c9481a67c4f6352ebbdd249b789c0467ddc"},- {file = "websockets-11.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:25e265686ea385f22a00cc2b719b880797cd1bb53b46dbde969e554fb458bfde"},- {file = "websockets-11.0.2-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:ce69f5c742eefd039dce8622e99d811ef2135b69d10f9aa79fbf2fdcc1e56cd7"},- {file = "websockets-11.0.2-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b985ba2b9e972cf99ddffc07df1a314b893095f62c75bc7c5354a9c4647c6503"},- {file = "websockets-11.0.2-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1b52def56d2a26e0e9c464f90cadb7e628e04f67b0ff3a76a4d9a18dfc35e3dd"},- {file = "websockets-11.0.2-pp37-pypy37_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d70a438ef2a22a581d65ad7648e949d4ccd20e3c8ed7a90bbc46df4e60320891"},- {file = "websockets-11.0.2-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:752fbf420c71416fb1472fec1b4cb8631c1aa2be7149e0a5ba7e5771d75d2bb9"},- {file = "websockets-11.0.2-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:dd906b0cdc417ea7a5f13bb3c6ca3b5fd563338dc596996cb0fdd7872d691c0a"},- {file = "websockets-11.0.2-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3e79065ff6549dd3c765e7916067e12a9c91df2affea0ac51bcd302aaf7ad207"},- {file = "websockets-11.0.2-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:46388a050d9e40316e58a3f0838c63caacb72f94129eb621a659a6e49bad27ce"},- {file = "websockets-11.0.2-pp38-pypy38_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5c7de298371d913824f71b30f7685bb07ad13969c79679cca5b1f7f94fec012f"},- {file = "websockets-11.0.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:6d872c972c87c393e6a49c1afbdc596432df8c06d0ff7cd05aa18e885e7cfb7c"},- {file = "websockets-11.0.2-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b444366b605d2885f0034dd889faf91b4b47668dd125591e2c64bfde611ac7e1"},- {file = "websockets-11.0.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e8b967a4849db6b567dec3f7dd5d97b15ce653e3497b8ce0814e470d5e074750"},- {file = "websockets-11.0.2-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2acdc82099999e44fa7bd8c886f03c70a22b1d53ae74252f389be30d64fd6004"},- {file = "websockets-11.0.2-pp39-pypy39_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:518ed6782d9916c5721ebd61bb7651d244178b74399028302c8617d0620af291"},- {file = "websockets-11.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:58477b041099bb504e1a5ddd8aa86302ed1d5c6995bdd3db2b3084ef0135d277"},- {file = "websockets-11.0.2-py3-none-any.whl", hash = "sha256:5004c087d17251938a52cce21b3dbdabeecbbe432ce3f5bbbf15d8692c36eac9"},- {file = "websockets-11.0.2.tar.gz", hash = "sha256:b1a69701eb98ed83dd099de4a686dc892c413d974fa31602bc00aca7cb988ac9"},-]--[[package]]-name = "werkzeug"-version = "2.2.3"-description = "The comprehensive WSGI web application library."-category = "main"-optional = false-python-versions = ">=3.7"-files = [- {file = "Werkzeug-2.2.3-py3-none-any.whl", hash = "sha256:56433961bc1f12533306c624f3be5e744389ac61d722175d543e1751285da612"},- {file = "Werkzeug-2.2.3.tar.gz", hash = "sha256:2e1ccc9417d4da358b9de6f174e3ac094391ea1d4fbef2d667865d819dfd0afe"},+ {file = "websockets-10.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d58804e996d7d2307173d56c297cf7bc132c52df27a3efaac5e8d43e36c21c48"},+ {file = "websockets-10.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:bc0b82d728fe21a0d03e65f81980abbbcb13b5387f733a1a870672c5be26edab"},+ {file = "websockets-10.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ba089c499e1f4155d2a3c2a05d2878a3428cf321c848f2b5a45ce55f0d7d310c"},+ {file = "websockets-10.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:33d69ca7612f0ddff3316b0c7b33ca180d464ecac2d115805c044bf0a3b0d032"},+ {file = "websockets-10.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:62e627f6b6d4aed919a2052efc408da7a545c606268d5ab5bfab4432734b82b4"},+ {file = "websockets-10.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:38ea7b82bfcae927eeffc55d2ffa31665dc7fec7b8dc654506b8e5a518eb4d50"},+ {file = "websockets-10.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e0cb5cc6ece6ffa75baccfd5c02cffe776f3f5c8bf486811f9d3ea3453676ce8"},+ {file = "websockets-10.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:ae5e95cfb53ab1da62185e23b3130e11d64431179debac6dc3c6acf08760e9b1"},+ {file = "websockets-10.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7c584f366f46ba667cfa66020344886cf47088e79c9b9d39c84ce9ea98aaa331"},+ {file = "websockets-10.4-cp310-cp310-win32.whl", hash = "sha256:b029fb2032ae4724d8ae8d4f6b363f2cc39e4c7b12454df8df7f0f563ed3e61a"},+ {file = "websockets-10.4-cp310-cp310-win_amd64.whl", hash = "sha256:8dc96f64ae43dde92530775e9cb169979f414dcf5cff670455d81a6823b42089"},+ {file = "websockets-10.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:47a2964021f2110116cc1125b3e6d87ab5ad16dea161949e7244ec583b905bb4"},+ {file = "websockets-10.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e789376b52c295c4946403bd0efecf27ab98f05319df4583d3c48e43c7342c2f"},+ {file = "websockets-10.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7d3f0b61c45c3fa9a349cf484962c559a8a1d80dae6977276df8fd1fa5e3cb8c"},+ {file = "websockets-10.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f55b5905705725af31ccef50e55391621532cd64fbf0bc6f4bac935f0fccec46"},+ {file = "websockets-10.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:00c870522cdb69cd625b93f002961ffb0c095394f06ba8c48f17eef7c1541f96"},+ {file = "websockets-10.4-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f38706e0b15d3c20ef6259fd4bc1700cd133b06c3c1bb108ffe3f8947be15fa"},+ {file = "websockets-10.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f2c38d588887a609191d30e902df2a32711f708abfd85d318ca9b367258cfd0c"},+ {file = "websockets-10.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:fe10ddc59b304cb19a1bdf5bd0a7719cbbc9fbdd57ac80ed436b709fcf889106"},+ {file = "websockets-10.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:90fcf8929836d4a0e964d799a58823547df5a5e9afa83081761630553be731f9"},+ {file = "websockets-10.4-cp311-cp311-win32.whl", hash = "sha256:b9968694c5f467bf67ef97ae7ad4d56d14be2751000c1207d31bf3bb8860bae8"},+ {file = "websockets-10.4-cp311-cp311-win_amd64.whl", hash = "sha256:a7a240d7a74bf8d5cb3bfe6be7f21697a28ec4b1a437607bae08ac7acf5b4882"},+ {file = "websockets-10.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:74de2b894b47f1d21cbd0b37a5e2b2392ad95d17ae983e64727e18eb281fe7cb"},+ {file = "websockets-10.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e3a686ecb4aa0d64ae60c9c9f1a7d5d46cab9bfb5d91a2d303d00e2cd4c4c5cc"},+ {file = "websockets-10.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b0d15c968ea7a65211e084f523151dbf8ae44634de03c801b8bd070b74e85033"},+ {file = "websockets-10.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00213676a2e46b6ebf6045bc11d0f529d9120baa6f58d122b4021ad92adabd41"},+ {file = "websockets-10.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:e23173580d740bf8822fd0379e4bf30aa1d5a92a4f252d34e893070c081050df"},+ {file = "websockets-10.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:dd500e0a5e11969cdd3320935ca2ff1e936f2358f9c2e61f100a1660933320ea"},+ {file = "websockets-10.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:4239b6027e3d66a89446908ff3027d2737afc1a375f8fd3eea630a4842ec9a0c"},+ {file = "websockets-10.4-cp37-cp37m-win32.whl", hash = "sha256:8a5cc00546e0a701da4639aa0bbcb0ae2bb678c87f46da01ac2d789e1f2d2038"},+ {file = "websockets-10.4-cp37-cp37m-win_amd64.whl", hash = "sha256:a9f9a735deaf9a0cadc2d8c50d1a5bcdbae8b6e539c6e08237bc4082d7c13f28"},+ {file = "websockets-10.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5c1289596042fad2cdceb05e1ebf7aadf9995c928e0da2b7a4e99494953b1b94"},+ {file = "websockets-10.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0cff816f51fb33c26d6e2b16b5c7d48eaa31dae5488ace6aae468b361f422b63"},+ {file = "websockets-10.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:dd9becd5fe29773d140d68d607d66a38f60e31b86df75332703757ee645b6faf"},+ {file = "websockets-10.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45ec8e75b7dbc9539cbfafa570742fe4f676eb8b0d3694b67dabe2f2ceed8aa6"},+ {file = "websockets-10.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4f72e5cd0f18f262f5da20efa9e241699e0cf3a766317a17392550c9ad7b37d8"},+ {file = "websockets-10.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:185929b4808b36a79c65b7865783b87b6841e852ef5407a2fb0c03381092fa3b"},+ {file = "websockets-10.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:7d27a7e34c313b3a7f91adcd05134315002aaf8540d7b4f90336beafaea6217c"},+ {file = "websockets-10.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:884be66c76a444c59f801ac13f40c76f176f1bfa815ef5b8ed44321e74f1600b"},+ {file = "websockets-10.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:931c039af54fc195fe6ad536fde4b0de04da9d5916e78e55405436348cfb0e56"},+ {file = "websockets-10.4-cp38-cp38-win32.whl", hash = "sha256:db3c336f9eda2532ec0fd8ea49fef7a8df8f6c804cdf4f39e5c5c0d4a4ad9a7a"},+ {file = "websockets-10.4-cp38-cp38-win_amd64.whl", hash = "sha256:48c08473563323f9c9debac781ecf66f94ad5a3680a38fe84dee5388cf5acaf6"},+ {file = "websockets-10.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:40e826de3085721dabc7cf9bfd41682dadc02286d8cf149b3ad05bff89311e4f"},+ {file = "websockets-10.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:56029457f219ade1f2fc12a6504ea61e14ee227a815531f9738e41203a429112"},+ {file = "websockets-10.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f5fc088b7a32f244c519a048c170f14cf2251b849ef0e20cbbb0fdf0fdaf556f"},+ {file = "websockets-10.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2fc8709c00704194213d45e455adc106ff9e87658297f72d544220e32029cd3d"},+ {file = "websockets-10.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0154f7691e4fe6c2b2bc275b5701e8b158dae92a1ab229e2b940efe11905dff4"},+ {file = "websockets-10.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c6d2264f485f0b53adf22697ac11e261ce84805c232ed5dbe6b1bcb84b00ff0"},+ {file = "websockets-10.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9bc42e8402dc5e9905fb8b9649f57efcb2056693b7e88faa8fb029256ba9c68c"},+ {file = "websockets-10.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:edc344de4dac1d89300a053ac973299e82d3db56330f3494905643bb68801269"},+ {file = "websockets-10.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:84bc2a7d075f32f6ed98652db3a680a17a4edb21ca7f80fe42e38753a58ee02b"},+ {file = "websockets-10.4-cp39-cp39-win32.whl", hash = "sha256:c94ae4faf2d09f7c81847c63843f84fe47bf6253c9d60b20f25edfd30fb12588"},+ {file = "websockets-10.4-cp39-cp39-win_amd64.whl", hash = "sha256:bbccd847aa0c3a69b5f691a84d2341a4f8a629c6922558f2a70611305f902d74"},+ {file = "websockets-10.4-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:82ff5e1cae4e855147fd57a2863376ed7454134c2bf49ec604dfe71e446e2193"},+ {file = "websockets-10.4-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d210abe51b5da0ffdbf7b43eed0cfdff8a55a1ab17abbec4301c9ff077dd0342"},+ {file = "websockets-10.4-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:942de28af58f352a6f588bc72490ae0f4ccd6dfc2bd3de5945b882a078e4e179"},+ {file = "websockets-10.4-pp37-pypy37_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c9b27d6c1c6cd53dc93614967e9ce00ae7f864a2d9f99fe5ed86706e1ecbf485"},+ {file = "websockets-10.4-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:3d3cac3e32b2c8414f4f87c1b2ab686fa6284a980ba283617404377cd448f631"},+ {file = "websockets-10.4-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:da39dd03d130162deb63da51f6e66ed73032ae62e74aaccc4236e30edccddbb0"},+ {file = "websockets-10.4-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:389f8dbb5c489e305fb113ca1b6bdcdaa130923f77485db5b189de343a179393"},+ {file = "websockets-10.4-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09a1814bb15eff7069e51fed0826df0bc0702652b5cb8f87697d469d79c23576"},+ {file = "websockets-10.4-pp38-pypy38_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ff64a1d38d156d429404aaa84b27305e957fd10c30e5880d1765c9480bea490f"},+ {file = "websockets-10.4-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:b343f521b047493dc4022dd338fc6db9d9282658862756b4f6fd0e996c1380e1"},+ {file = "websockets-10.4-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:932af322458da7e4e35df32f050389e13d3d96b09d274b22a7aa1808f292fee4"},+ {file = "websockets-10.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d6a4162139374a49eb18ef5b2f4da1dd95c994588f5033d64e0bbfda4b6b6fcf"},+ {file = "websockets-10.4-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c57e4c1349fbe0e446c9fa7b19ed2f8a4417233b6984277cce392819123142d3"},+ {file = "websockets-10.4-pp39-pypy39_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b627c266f295de9dea86bd1112ed3d5fafb69a348af30a2422e16590a8ecba13"},+ {file = "websockets-10.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:05a7233089f8bd355e8cbe127c2e8ca0b4ea55467861906b80d2ebc7db4d6b72"},+ {file = "websockets-10.4.tar.gz", hash = "sha256:eef610b23933c54d5d921c92578ae5f89813438fded840c2e9809d378dc765d3"},]-[package.dependencies]-MarkupSafe = ">=2.1.1"--[package.extras]-watchdog = ["watchdog"]-[[package]]name = "wsproto"version = "1.2.0"description = "WebSockets state-machine based protocol implementation"-category = "main"+category = "dev"optional = falsepython-versions = ">=3.7.0"files = [@@ -2234,4 +2100,4 @@ multidict = ">=4.0"[metadata]lock-version = "2.0"python-versions = ">=3.10,<4.0"-content-hash = "de04580c8b3ca66ddef377c7c84f6fbeb5c0a3a1c66a5fe0180ce999133596e9"+content-hash = "8100077e4dde43817d31746c514de965d5bc31ff8a297d64c61519edd03b197b"diff --git a/api-service/pyproject.toml b/api-service/pyproject.tomlindex 52e30bee5..e96d95a59 100644--- a/api-service/pyproject.toml+++ b/api-service/pyproject.toml@@ -14,18 +14,18 @@ openai = "^0.27.0"lxml = "^4.9.2"asyncio = "^3.4.3"postgrest = "^0.10.6"-quart-cors = "^0.6.0"-quart = "^0.18.4"replicate = "^0.8.1"huggingface-hub = "^0.13.4"anthropic = "^0.2.6"langchain = "^0.0.141"banana-dev = "4.0.2"+fastapi = "^0.95.1"[tool.poetry.group.dev]optional = true[tool.poetry.group.dev.dependencies]+hypercorn = "^0.14.3"python-dotenv = "^1.0.0"pytest = "^7.2.2"@@ -33,8 +33,8 @@ pytest = "^7.2.2"optional = true[tool.poetry.group.deploy.dependencies]-gunicorn = "^20.1.0"uvicorn = {extras = ["standard"], version = "^0.21.1"}+gunicorn = "^20.1.0"[build-system]requires = ["poetry-core>=1.3.0"]diff --git a/api-service/run.py b/api-service/run.pynew file mode 100644index 000000000..5cbae48c1--- /dev/null+++ b/api-service/run.py@@ -0,0 +1,49 @@+from codegen.callbacks.log_processor import LogProcessor+from codegen.callbacks.logs import OnLogs+from codegen.codegen import Codegen+from codegen.tools.base import create_tools+from database.database import DeploymentState+from models.base import ModelConfig+from database import db+from session import NodeJSPlayground+++async def run_agent(+ project_id: str,+ run_id: str,+ model_config: ModelConfig,+ log_processor: LogProcessor,+):+ await db.create_deployment(run_id=run_id, project_id=project_id)+ playground = None++ try:+ # Create playground for the LLM+ playground = NodeJSPlayground(get_envs=lambda: db.get_env_vars(project_id))++ # Create tools+ tools = create_tools(+ run_id=run_id,+ playground=playground,+ )++ # Create a new instance of code generator+ cg = Codegen(+ log_processor=log_processor,+ # The order in which we pass tools HAS an effect on the LLM behaviour.+ tools=list(tools),+ model_config=model_config,+ database=db,+ )++ # Generate the code+ print("Generating...", flush=True)+ await cg.generate(run_id=run_id)++ await db.finish_deployment(run_id=run_id)+ except:+ await db.update_state(run_id=run_id, state=DeploymentState.Error)+ raise+ finally:+ if playground is not None:+ playground.close()diff --git a/components/Editor/Sidebar/Agent/index.tsx b/components/Editor/Sidebar/Agent/index.tsxindex 53a02f674..a36b7b3bb 100644--- a/components/Editor/Sidebar/Agent/index.tsx+++ b/components/Editor/Sidebar/Agent/index.tsx@@ -1,15 +1,14 @@import { useState } from 'react'-import { deployment_state, deployments } from '@prisma/client'-import produce from 'immer'import { useSupabaseClient } from '@supabase/auth-helpers-react'import { useRouter } from 'next/router'+import produce from 'immer'+import { deployment_state } from '@prisma/client'import Text from 'components/Text'import { useTabs } from 'components/Tabs/useTabs'import Tabs from 'components/Tabs'import { Log, LogType, ToolName } from 'db/types'-import { Database, Json } from 'db/supabase'-import { deploymentsTable } from 'db/tables'+import { Database } from 'db/supabase'import useModelProviderArgs from 'hooks/useModelProviderArgs'import { getMissingCreds } from 'state/model'import { useStateStore } from 'state/StoreProvider'@@ -17,6 +16,8 @@ import Button from 'components/Button'import LogStream from './LogStream'import RunButton from '../RunButton'+import { AgentRun } from 'api-client/AgentDebugRun'+import { deploymentsTable } from 'db/tables'const tabsProps = {tabs: [@@ -32,20 +33,17 @@ const tabsProps = {}export interface Props {- deployment?: deployments- isDeployRequestRunning?: boolean- deploy: () => void- deployStatus?: deployment_state | null- isInitializingDeploy?: boolean- cancel: () => void+ logs?: Log[]+ agentState?: deployment_state+ run: () => void+ agentRun?: AgentRun}function Agent({- deployment,- cancel,- isDeployRequestRunning,- deploy,- isInitializingDeploy,+ agentState,+ agentRun,+ logs,+ run,}: Props) {const [selectedTab, setSelectedTab] = useState(0)const client = useSupabaseClient<Database>()@@ -62,9 +60,10 @@ function Agent({answer,toolName,}: { logID: string, answer: string, toolName: ToolName }) {- if (!deployment) return+ if (!agentRun?.runID) return+ if (!logs) return- const logs = produce(deployment.logs as unknown as Log[], ls => {+ const modifiedLogs = produce(logs, ls => {const log = ls.find(l => l.id === logID)if (log && log.type === LogType.Tool && log.tool_name === toolName) {log.tool_output = answer@@ -73,8 +72,8 @@ function Agent({await client.from(deploymentsTable)- .update({ logs: logs as unknown as Json[] })- .eq('id', deployment.id)+ .update({ logs: modifiedLogs as any })+ .eq('id', agentRun.runID).single()}@@ -138,15 +137,12 @@ function Agent({}<RunButtondisabled={missingCreds.length !== 0}- deploy={deploy}- cancel={cancel}- isDeployRequestRunning={isDeployRequestRunning}- isInitializingDeploy={isInitializingDeploy}- deployStatus={deployment?.state}+ deploy={run}+ deployStatus={agentState}/></div></div>- {!deployment &&+ {!agentState &&<divclassName="self-center@@ -160,19 +156,19 @@ function Agent({/></div>}- {selectedTab === 0 && deployment &&+ {selectedTab === 0 && logs &&<LogStream- logs={deployment.logs as unknown as Log[] | undefined}+ logs={logs}onAnswer={saveAnswer}- isDeployRequestRunning={isDeployRequestRunning}+ isDeployRequestRunning={agentState === deployment_state.generating}/>}- {selectedTab === 1 && deployment &&+ {/* {selectedTab === 1 && deployment &&<LogStreamrawLogs={deployment?.logs_raw}isDeployRequestRunning={isDeployRequestRunning}/>- }+ } */}</div>)}diff --git a/components/Editor/Sidebar/RunButton.tsx b/components/Editor/Sidebar/RunButton.tsxindex e381aa826..9c2410fb8 100644--- a/components/Editor/Sidebar/RunButton.tsx+++ b/components/Editor/Sidebar/RunButton.tsx@@ -10,7 +10,6 @@ export interface Props {isInitializingDeploy?: booleanisDeployRequestRunning?: booleandisabled?: boolean- cancel: () => void}interface DeploymentRepresentation {@@ -49,7 +48,6 @@ function getProgressRepresentation(deployStatus: deployment_state | null | undeffunction DeployButton({deploy,- cancel,disabled,deployStatus,isDeployRequestRunning,@@ -58,22 +56,13 @@ function DeployButton({const representation = getProgressRepresentation(deployStatus, isInitializingDeploy)return (- <>- {/* {isDeployRequestRunning &&- <Button- onClick={cancel}- variant={Button.variant.Outline}- icon={<Ban size="16px" />}- />- } */}- <Button- isDisabled={isDeployRequestRunning || disabled}- text={representation.text}- onClick={deploy}- variant={Button.variant.Full}- icon={representation.icon}- />- </>+ <Button+ isDisabled={isDeployRequestRunning || disabled}+ text={representation.text}+ onClick={deploy}+ variant={Button.variant.Full}+ icon={representation.icon}+ />)}diff --git a/components/Editor/Sidebar/index.tsx b/components/Editor/Sidebar/index.tsxindex 22f89c0a9..2ed524030 100644--- a/components/Editor/Sidebar/index.tsx+++ b/components/Editor/Sidebar/index.tsx@@ -1,12 +1,9 @@-import { useEffect, useRef, useState } from 'react'import clsx from 'clsx'-import useSWRMutation from 'swr/mutation'import { projects } from '@prisma/client'-import { useLatestDeployment } from 'hooks/useLatestDeployment'import { useStateStore } from 'state/StoreProvider'-import { ModelConfig, getModelArgs } from 'state/model'-import useModelProviderArgs, { Creds } from 'hooks/useModelProviderArgs'+import { getModelArgs } from 'state/model'+import useModelProviderArgs from 'hooks/useModelProviderArgs'import { evaluatePrompt } from 'state/prompt'import Agent from './Agent'@@ -14,114 +11,66 @@ import Envs from './Envs'import Model from './Model'import Prompt from './Prompt'import { MenuSection } from '../SidebarMenu'-import { EnvVar } from 'state/envs'-import { Instructions, InstructionsTransform } from 'state/instruction'++import useAgentRun from 'hooks/useAgentRun'export interface Props {project: projectsactiveMenuSection?: MenuSection}-interface PostGenerateBody {- projectID: string- modelConfig: ModelConfig- envs: EnvVar[]-}--async function handlePostGenerate(url: string, { arg }: {- arg: {- controller: AbortController,- creds: Creds,- projectID: string,- modelConfig: ModelConfig,- instructions: Instructions,- instructionsTransform: InstructionsTransform,- envs: EnvVar[],- }-}) {- const body: PostGenerateBody = {- projectID: arg.projectID,- modelConfig: {- ...arg.modelConfig,- args: getModelArgs(arg.modelConfig, arg.creds),- prompt: evaluatePrompt(- arg.instructions,- arg.instructionsTransform,- arg.modelConfig.prompt,- ),- },- envs: arg.envs,- }-- return await fetch(url, {- signal: arg.controller.signal,- method: 'POST',- body: JSON.stringify(body),- headers: {- 'Content-Type': 'application/json',- },- }).then(r => r.json())-}--const apiURL = process.env.NEXT_PUBLIC_PROXY- ? '/api/service'- : process.env.NEXT_PUBLIC_API_URL-function Sidebar({project,activeMenuSection,}: Props) {- const deployment = useLatestDeployment(project)const {- trigger: generate,- isMutating: isDeployRequestRunning,- } = useSWRMutation(`${apiURL}/generate`, handlePostGenerate)-- const generateController = useRef<AbortController | null>(null)+ agentRun,+ logs,+ start,+ agentState,+ } = useAgentRun()const [selectors] = useStateStore()- const envs = selectors.use.envs()const modelConfig = selectors.use.getSelectedModelConfig()()const instructions = selectors.use.instructions()const instructionsTransform = selectors.use.instructionsTransform()const [creds] = useModelProviderArgs()- const [isInitializingDeploy, setIsInitializingDeploy] = useState(false)-- useEffect(function handleDeployState() {- if (!deployment) return- setIsInitializingDeploy(false)- }, [deployment])-- useEffect(function handleDeployState() {- if (!isDeployRequestRunning) return- setIsInitializingDeploy(true)- }, [isDeployRequestRunning])-- async function deploy() {+ async function run() {if (!modelConfig) {console.error('Cannot get model config')return}- const controller = new AbortController()- generateController.current = controller-- await generate({- controller,- projectID: project.id,- modelConfig,- creds,- instructions,- instructionsTransform,- envs,- })- }-- function cancelGenerate() {- generateController.current?.abort()+ try {+ await start(project.id, {+ ...modelConfig,+ args: getModelArgs(modelConfig, creds) as any,+ prompt: evaluatePrompt(+ instructions,+ instructionsTransform,+ modelConfig.prompt,+ ),+ })++ // setIsDeployRequestRunning(true)+ // await generate({+ // project_id: project.id,+ // model_config: {+ // ...modelConfig,+ // args: getModelArgs(modelConfig, creds) as any,+ // prompt: evaluatePrompt(+ // instructions,+ // instructionsTransform,+ // modelConfig.prompt,+ // ),+ // },+ // })+ } finally {+ // setIsDeployRequestRunning(false)+ }}return (@@ -146,11 +95,10 @@ function Sidebar({}{activeMenuSection === MenuSection.Agent &&<Agent- deploy={deploy}- cancel={cancelGenerate}- isDeployRequestRunning={isDeployRequestRunning}- isInitializingDeploy={isInitializingDeploy}- deployment={deployment}+ run={run}+ agentState={agentState}+ logs={logs}+ agentRun={agentRun}/>}</div>diff --git a/db/credentials.ts b/db/credentials.tsindex 538dcd95f..cb1e9be2a 100644--- a/db/credentials.ts+++ b/db/credentials.ts@@ -3,13 +3,13 @@ export const serverCreds = {supabaseKey: process.env.SUPABASE_SERVICE_ROLE_KEY,}-const supabaseURL = typeof window !== 'undefined'+export const localURL = typeof window !== 'undefined'? `${window.location.protocol}//${window.location.host}`: 'http://localhost:3000'export const clientCreds = {supabaseUrl: process.env.NEXT_PUBLIC_PROXY- ? `${supabaseURL}/api/supabase`+ ? `${localURL}/api/supabase`: process.env.NEXT_PUBLIC_SUPABASE_URL,supabaseKey: process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY,}diff --git a/hooks/useAgentRun.ts b/hooks/useAgentRun.tsnew file mode 100644index 000000000..75f7a6196--- /dev/null+++ b/hooks/useAgentRun.ts@@ -0,0 +1,34 @@+import { useCallback, useState } from 'react'++import { AgentRun } from 'api-client/AgentDebugRun'+import { Log } from 'db/types'+import { ModelConfig } from 'state/model'+import { baseUrl } from 'api-client/api'+import { deployment_state } from '@prisma/client'++function useAgentRun() {+ const [agentRun, setAgentRun] = useState<AgentRun>()+ const [logs, setLogs] = useState<Log[]>([])+ const [agentState, setAgentState] = useState<deployment_state>()++ const start = useCallback(async (projectID: string, modelConfig: ModelConfig) => {+ const run = new AgentRun(`${baseUrl}/dev/agent`, {+ onLogs: setLogs,+ onStateChange: setAgentState,+ })++ setLogs([])+ setAgentRun(run)+ await run.connect()+ return run.startRun(projectID, modelConfig)+ }, [setAgentRun, setLogs])++ return {+ start,+ agentRun,+ logs,+ agentState,+ }+}++export default useAgentRundiff --git a/hooks/useQueryTab.ts b/hooks/useQueryTab.tsdeleted file mode 100644index 82da84446..000000000--- a/hooks/useQueryTab.ts+++ /dev/null@@ -1,32 +0,0 @@-import { useRouter } from 'next/router'-import { useCallback } from 'react'--type Base = Record<string, string | number>--interface SetTab<T> {- (tab: keyof T): void-}--function compareTabsCaseInsensitive<T extends Base>(tabs: T, tab?: string) {- return Object- .values(tabs)- .find(v => v.toString().toLowerCase() === tab?.toLowerCase())-}--export function useQueryTab<T extends Base>(key: string, tabs: T, defaultTab: keyof T): [keyof T, SetTab<T>] {- const router = useRouter()-- const tab = compareTabsCaseInsensitive(tabs, router.query[key] as string) as keyof T || defaultTab-- const setTab = useCallback<SetTab<T>>(tab => {- router.push({- pathname: router.pathname,- query: {- ...router.query,- [key]: tabs[tab] as string,- }- }, undefined, { shallow: true })- }, [key, router, tabs])-- return [tab, setTab]-}diff --git a/package-lock.json b/package-lock.jsonindex f1e8eb498..e169fdcb9 100644--- a/package-lock.json+++ b/package-lock.json@@ -10,7 +10,7 @@"hasInstallScript": true,"dependencies": {"@devbookhq/splitter": "^1.4.0",- "@prisma/client": "^4.12.0",+ "@prisma/client": "^4.13.0","@supabase/auth-helpers-nextjs": "^0.5.5","@supabase/auth-helpers-react": "^0.3.1","@supabase/supabase-js": "^2.10.0",@@ -25,6 +25,7 @@"@tiptap/react": "^2.0.0-beta.220","@tiptap/starter-kit": "^2.0.0-beta.220","clsx": "^1.2.1",+ "cross-fetch": "^3.1.5","fuse.js": "^6.6.2","http-proxy-middleware": "^3.0.0-beta.1","human-id": "^4.0.0",@@ -35,6 +36,7 @@"nanoid": "^4.0.1","next": "13.2.3","next-superjson-plugin": "^0.5.6",+ "openapi-typescript-fetch": "^1.1.3","prosemirror-markdown": "^1.10.1","prosemirror-state": "^1.4.2","prosemirror-view": "^1.30.2",@@ -42,6 +44,8 @@"react-dom": "18.2.0","react-markdown": "^8.0.5","react-textarea-autosize": "^8.4.0",+ "rpc-websocket-client": "^1.1.4",+ "rpc-websockets": "^7.5.1","sharp": "^0.32.0","superjson": "^1.12.2","swr": "^2.0.4",@@ -53,20 +57,20 @@"@tailwindcss/typography": "^0.5.9","@types/mustache": "^4.2.2","@types/node": "^18.14.6",- "@types/randomcolor": "^0.5.7","@types/react": "^18.0.28","@types/react-dom": "^18.0.11","autoprefixer": "^10.4.13","concurrently": "^7.6.0","cross-env": "^7.0.3",- "cssnano": "^5.1.15",+ "cssnano": "^6.0.0","eslint": "^8.35.0","eslint-config-next": "^13.2.3","eslint-plugin-tailwindcss": "^3.10.1","eslint-plugin-unused-imports": "^2.0.0",+ "openapi-typescript": "^6.2.1","postcss": "^8.4.21","postcss-import": "^15.1.0",- "prisma": "^4.12.0",+ "prisma": "^4.13.0","supabase": "^1.46.5","tailwindcss": "^3.2.7","typescript": "^4.9.5"@@ -156,6 +160,60 @@"integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==","dev": true},+ "node_modules/@jridgewell/gen-mapping": {+ "version": "0.3.3",+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",+ "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",+ "dev": true,+ "dependencies": {+ "@jridgewell/set-array": "^1.0.1",+ "@jridgewell/sourcemap-codec": "^1.4.10",+ "@jridgewell/trace-mapping": "^0.3.9"+ },+ "engines": {+ "node": ">=6.0.0"+ }+ },+ "node_modules/@jridgewell/resolve-uri": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",+ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",+ "dev": true,+ "engines": {+ "node": ">=6.0.0"+ }+ },+ "node_modules/@jridgewell/set-array": {+ "version": "1.1.2",+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",+ "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",+ "dev": true,+ "engines": {+ "node": ">=6.0.0"+ }+ },+ "node_modules/@jridgewell/sourcemap-codec": {+ "version": "1.4.15",+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",+ "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",+ "dev": true+ },+ "node_modules/@jridgewell/trace-mapping": {+ "version": "0.3.18",+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",+ "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",+ "dev": true,+ "dependencies": {+ "@jridgewell/resolve-uri": "3.1.0",+ "@jridgewell/sourcemap-codec": "1.4.14"+ }+ },+ "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {+ "version": "1.4.14",+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",+ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",+ "dev": true+ },"node_modules/@linaria/core": {"version": "3.0.0-beta.13","resolved": "https://registry.npmjs.org/@linaria/core/-/core-3.0.0-beta.13.tgz",@@ -435,12 +493,12 @@}},"node_modules/@prisma/client": {- "version": "4.12.0",- "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.12.0.tgz",- "integrity": "sha512-j9/ighfWwux97J2dS15nqhl60tYoH8V0IuSsgZDb6bCFcQD3fXbXmxjYC8GHhIgOk3lB7Pq+8CwElz2MiDpsSg==",+ "version": "4.13.0",+ "resolved": "https://registry.npmjs.org/@prisma/client/-/client-4.13.0.tgz",+ "integrity": "sha512-YaiiICcRB2hatxsbnfB66uWXjcRw3jsZdlAVxmx0cFcTc/Ad/sKdHCcWSnqyDX47vAewkjRFwiLwrOUjswVvmA==","hasInstallScript": true,"dependencies": {- "@prisma/engines-version": "4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7"+ "@prisma/engines-version": "4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a"},"engines": {"node": ">=14.17"@@ -455,16 +513,16 @@}},"node_modules/@prisma/engines": {- "version": "4.12.0",- "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.12.0.tgz",- "integrity": "sha512-0alKtnxhNB5hYU+ymESBlGI4b9XrGGSdv7Ud+8TE/fBNOEhIud0XQsAR+TrvUZgS4na5czubiMsODw0TUrgkIA==",+ "version": "4.13.0",+ "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.13.0.tgz",+ "integrity": "sha512-HrniowHRZXHuGT9XRgoXEaP2gJLXM5RMoItaY2PkjvuZ+iHc0Zjbm/302MB8YsPdWozAPHHn+jpFEcEn71OgPw==","devOptional": true,"hasInstallScript": true},"node_modules/@prisma/engines-version": {- "version": "4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7",- "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.12.0-67.659ef412370fa3b41cd7bf6e94587c1dfb7f67e7.tgz",- "integrity": "sha512-JIHNj5jlXb9mcaJwakM0vpgRYJIAurxTUqM0iX0tfEQA5XLZ9ONkIckkhuAKdAzocZ+80GYg7QSsfpjg7OxbOA=="+ "version": "4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a",+ "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-4.13.0-50.1e7af066ee9cb95cf3a403c78d9aab3e6b04f37a.tgz",+ "integrity": "sha512-fsQlbkhPJf08JOzKoyoD9atdUijuGBekwoOPZC3YOygXEml1MTtgXVpnUNchQlRSY82OQ6pSGQ9PxUe4arcSLQ=="},"node_modules/@remirror/core-constants": {"version": "2.0.0",@@ -625,6 +683,19 @@"tailwindcss": ">=3.0.0 || insiders"}},+ "node_modules/@tailwindcss/typography/node_modules/postcss-selector-parser": {+ "version": "6.0.10",+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",+ "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",+ "dev": true,+ "dependencies": {+ "cssesc": "^3.0.0",+ "util-deprecate": "^1.0.2"+ },+ "engines": {+ "node": ">=4"+ }+ },"node_modules/@tiptap/core": {"version": "2.0.3","resolved": "https://registry.npmjs.org/@tiptap/core/-/core-2.0.3.tgz",@@ -1068,12 +1139,6 @@"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz","integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w=="},- "node_modules/@types/randomcolor": {- "version": "0.5.7",- "resolved": "https://registry.npmjs.org/@types/randomcolor/-/randomcolor-0.5.7.tgz",- "integrity": "sha512-LPcG96dGYRCsXlk1fslUNIg6ebEi+bKNyn84uBL/pu2cRSf5i/djD3ArJZOyzszVMVV/DB87va6pMZP+tRSl/w==",- "dev": true- },"node_modules/@types/react": {"version": "18.0.28","resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz",@@ -1230,38 +1295,6 @@"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"}},- "node_modules/acorn-node": {- "version": "1.8.2",- "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",- "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",- "dev": true,- "dependencies": {- "acorn": "^7.0.0",- "acorn-walk": "^7.0.0",- "xtend": "^4.0.2"- }- },- "node_modules/acorn-node/node_modules/acorn": {- "version": "7.4.1",- "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",- "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",- "dev": true,- "bin": {- "acorn": "bin/acorn"- },- "engines": {- "node": ">=0.4.0"- }- },- "node_modules/acorn-walk": {- "version": "7.2.0",- "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",- "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",- "dev": true,- "engines": {- "node": ">=0.4.0"- }- },"node_modules/ajv": {"version": "6.12.6","resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",@@ -1278,6 +1311,15 @@"url": "https://github.com/sponsors/epoberezkin"}},+ "node_modules/ansi-colors": {+ "version": "4.1.3",+ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",+ "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",+ "dev": true,+ "engines": {+ "node": ">=6"+ }+ },"node_modules/ansi-regex": {"version": "5.0.1","resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",@@ -1302,6 +1344,12 @@"url": "https://github.com/chalk/ansi-styles?sponsor=1"}},+ "node_modules/any-promise": {+ "version": "1.3.0",+ "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",+ "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",+ "dev": true+ },"node_modules/anymatch": {"version": "3.1.3","resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",@@ -1639,6 +1687,18 @@"node": ">=6.14.2"}},+ "node_modules/busboy": {+ "version": "1.6.0",+ "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",+ "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==",+ "dev": true,+ "dependencies": {+ "streamsearch": "^1.1.0"+ },+ "engines": {+ "node": ">=10.16.0"+ }+ },"node_modules/call-bind": {"version": "1.0.2","resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",@@ -1983,9 +2043,9 @@}},"node_modules/css-declaration-sorter": {- "version": "6.3.1",- "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",- "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",+ "version": "6.4.0",+ "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz",+ "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==","dev": true,"engines": {"node": "^10 || ^12 || >=14"@@ -1995,15 +2055,15 @@}},"node_modules/css-select": {- "version": "4.3.0",- "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",- "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",+ "version": "5.1.0",+ "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",+ "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==","dev": true,"dependencies": {"boolbase": "^1.0.0",- "css-what": "^6.0.1",- "domhandler": "^4.3.1",- "domutils": "^2.8.0",+ "css-what": "^6.1.0",+ "domhandler": "^5.0.2",+ "domutils": "^3.0.1","nth-check": "^2.0.1"},"funding": {@@ -2011,16 +2071,16 @@}},"node_modules/css-tree": {- "version": "1.1.3",- "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",- "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",+ "version": "2.3.1",+ "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",+ "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==","dev": true,"dependencies": {- "mdn-data": "2.0.14",- "source-map": "^0.6.1"+ "mdn-data": "2.0.30",+ "source-map-js": "^1.0.1"},"engines": {- "node": ">=8.0.0"+ "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"}},"node_modules/css-what": {@@ -2048,17 +2108,16 @@}},"node_modules/cssnano": {- "version": "5.1.15",- "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",- "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-6.0.0.tgz",+ "integrity": "sha512-RGlcbzGhzEBCHuQe3k+Udyj5M00z0pm9S+VurHXFEOXxH+y0sVrJH2sMzoyz2d8N1EScazg+DVvmgyx0lurwwA==","dev": true,"dependencies": {- "cssnano-preset-default": "^5.2.14",- "lilconfig": "^2.0.3",- "yaml": "^1.10.2"+ "cssnano-preset-default": "^6.0.0",+ "lilconfig": "^2.1.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"funding": {"type": "opencollective",@@ -2069,72 +2128,93 @@}},"node_modules/cssnano-preset-default": {- "version": "5.2.14",- "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",- "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-6.0.0.tgz",+ "integrity": "sha512-BDxlaFzObRDXUiCCBQUNQcI+f1/aX2mgoNtXGjV6PG64POcHoDUoX+LgMWw+Q4609QhxwkcSnS65YFs42RA6qQ==","dev": true,"dependencies": {"css-declaration-sorter": "^6.3.1",- "cssnano-utils": "^3.1.0",+ "cssnano-utils": "^4.0.0","postcss-calc": "^8.2.3",- "postcss-colormin": "^5.3.1",- "postcss-convert-values": "^5.1.3",- "postcss-discard-comments": "^5.1.2",- "postcss-discard-duplicates": "^5.1.0",- "postcss-discard-empty": "^5.1.1",- "postcss-discard-overridden": "^5.1.0",- "postcss-merge-longhand": "^5.1.7",- "postcss-merge-rules": "^5.1.4",- "postcss-minify-font-values": "^5.1.0",- "postcss-minify-gradients": "^5.1.1",- "postcss-minify-params": "^5.1.4",- "postcss-minify-selectors": "^5.2.1",- "postcss-normalize-charset": "^5.1.0",- "postcss-normalize-display-values": "^5.1.0",- "postcss-normalize-positions": "^5.1.1",- "postcss-normalize-repeat-style": "^5.1.1",- "postcss-normalize-string": "^5.1.0",- "postcss-normalize-timing-functions": "^5.1.0",- "postcss-normalize-unicode": "^5.1.1",- "postcss-normalize-url": "^5.1.0",- "postcss-normalize-whitespace": "^5.1.1",- "postcss-ordered-values": "^5.1.3",- "postcss-reduce-initial": "^5.1.2",- "postcss-reduce-transforms": "^5.1.0",- "postcss-svgo": "^5.1.0",- "postcss-unique-selectors": "^5.1.1"- },- "engines": {- "node": "^10 || ^12 || >=14.0"+ "postcss-colormin": "^6.0.0",+ "postcss-convert-values": "^6.0.0",+ "postcss-discard-comments": "^6.0.0",+ "postcss-discard-duplicates": "^6.0.0",+ "postcss-discard-empty": "^6.0.0",+ "postcss-discard-overridden": "^6.0.0",+ "postcss-merge-longhand": "^6.0.0",+ "postcss-merge-rules": "^6.0.0",+ "postcss-minify-font-values": "^6.0.0",+ "postcss-minify-gradients": "^6.0.0",+ "postcss-minify-params": "^6.0.0",+ "postcss-minify-selectors": "^6.0.0",+ "postcss-normalize-charset": "^6.0.0",+ "postcss-normalize-display-values": "^6.0.0",+ "postcss-normalize-positions": "^6.0.0",+ "postcss-normalize-repeat-style": "^6.0.0",+ "postcss-normalize-string": "^6.0.0",+ "postcss-normalize-timing-functions": "^6.0.0",+ "postcss-normalize-unicode": "^6.0.0",+ "postcss-normalize-url": "^6.0.0",+ "postcss-normalize-whitespace": "^6.0.0",+ "postcss-ordered-values": "^6.0.0",+ "postcss-reduce-initial": "^6.0.0",+ "postcss-reduce-transforms": "^6.0.0",+ "postcss-svgo": "^6.0.0",+ "postcss-unique-selectors": "^6.0.0"+ },+ "engines": {+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/cssnano-utils": {- "version": "3.1.0",- "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",- "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-4.0.0.tgz",+ "integrity": "sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw==","dev": true,"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/csso": {- "version": "4.2.0",- "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",- "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",+ "version": "5.0.5",+ "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",+ "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==","dev": true,"dependencies": {- "css-tree": "^1.1.2"+ "css-tree": "~2.2.0"},"engines": {- "node": ">=8.0.0"+ "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",+ "npm": ">=7.0.0"}},+ "node_modules/csso/node_modules/css-tree": {+ "version": "2.2.1",+ "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",+ "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",+ "dev": true,+ "dependencies": {+ "mdn-data": "2.0.28",+ "source-map-js": "^1.0.1"+ },+ "engines": {+ "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",+ "npm": ">=7.0.0"+ }+ },+ "node_modules/csso/node_modules/mdn-data": {+ "version": "2.0.28",+ "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",+ "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",+ "dev": true+ },"node_modules/csstype": {"version": "3.1.1","resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",@@ -2299,15 +2379,6 @@"url": "https://github.com/sponsors/ljharb"}},- "node_modules/defined": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz",- "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==",- "dev": true,- "funding": {- "url": "https://github.com/sponsors/ljharb"- }- },"node_modules/dequal": {"version": "2.0.3","resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",@@ -2324,23 +2395,6 @@"node": ">=8"}},- "node_modules/detective": {- "version": "5.2.1",- "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz",- "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==",- "dev": true,- "dependencies": {- "acorn-node": "^1.8.2",- "defined": "^1.0.0",- "minimist": "^1.2.6"- },- "bin": {- "detective": "bin/detective.js"- },- "engines": {- "node": ">=0.8.0"- }- },"node_modules/didyoumean": {"version": "1.2.2","resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",@@ -2386,24 +2440,27 @@}},"node_modules/dom-serializer": {- "version": "1.4.1",- "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",- "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",+ "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==","dev": true,"dependencies": {- "domelementtype": "^2.0.1",- "domhandler": "^4.2.0",- "entities": "^2.0.0"+ "domelementtype": "^2.3.0",+ "domhandler": "^5.0.2",+ "entities": "^4.2.0"},"funding": {"url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"}},"node_modules/dom-serializer/node_modules/entities": {- "version": "2.2.0",- "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",- "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",+ "version": "4.5.0",+ "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",+ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==","dev": true,+ "engines": {+ "node": ">=0.12"+ },"funding": {"url": "https://github.com/fb55/entities?sponsor=1"}@@ -2421,12 +2478,12 @@]},"node_modules/domhandler": {- "version": "4.3.1",- "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",- "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",+ "version": "5.0.3",+ "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",+ "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==","dev": true,"dependencies": {- "domelementtype": "^2.2.0"+ "domelementtype": "^2.3.0"},"engines": {"node": ">= 4"@@ -2436,14 +2493,14 @@}},"node_modules/domutils": {- "version": "2.8.0",- "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",- "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",+ "version": "3.0.1",+ "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz",+ "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==","dev": true,"dependencies": {- "dom-serializer": "^1.0.1",- "domelementtype": "^2.2.0",- "domhandler": "^4.2.0"+ "dom-serializer": "^2.0.0",+ "domelementtype": "^2.3.0",+ "domhandler": "^5.0.1"},"funding": {"url": "https://github.com/fb55/domutils?sponsor=1"@@ -3016,9 +3073,9 @@}},"node_modules/eslint-plugin-tailwindcss": {- "version": "3.10.1",- "resolved": "https://registry.npmjs.org/eslint-plugin-tailwindcss/-/eslint-plugin-tailwindcss-3.10.1.tgz",- "integrity": "sha512-NLPZ6b6nd/8CgGNMQ6NDiPUfBLQpSGu/u9RyX3MCZOwzNs2dFt1OamNAiRuo3Ixh7Gv4t5UcAcdNt8z74UDJkA==",+ "version": "3.11.0",+ "resolved": "https://registry.npmjs.org/eslint-plugin-tailwindcss/-/eslint-plugin-tailwindcss-3.11.0.tgz",+ "integrity": "sha512-RaraOG4D6VXutKnoNvFQ4+frTWGJDKtezy1yCrGFS7Um1to/npDNdh2GL19IRoGB/eanbtwhxFXy+xyEw0grAg==","dev": true,"dependencies": {"fast-glob": "^3.2.5",@@ -4331,6 +4388,23 @@"node": ">=0.10.0"}},+ "node_modules/isomorphic-ws": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz",+ "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==",+ "peerDependencies": {+ "ws": "*"+ }+ },+ "node_modules/jiti": {+ "version": "1.18.2",+ "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz",+ "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",+ "dev": true,+ "bin": {+ "jiti": "bin/jiti.js"+ }+ },"node_modules/js-sdsl": {"version": "4.3.0","resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",@@ -4448,6 +4522,12 @@"node": ">=10"}},+ "node_modules/lines-and-columns": {+ "version": "1.2.4",+ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",+ "dev": true+ },"node_modules/linkify-it": {"version": "4.0.1","resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",@@ -4625,9 +4705,9 @@}},"node_modules/mdn-data": {- "version": "2.0.14",- "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",- "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",+ "version": "2.0.30",+ "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",+ "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==","dev": true},"node_modules/mdurl": {@@ -5181,6 +5261,17 @@"mustache": "bin/mustache"}},+ "node_modules/mz": {+ "version": "2.7.0",+ "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",+ "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",+ "dev": true,+ "dependencies": {+ "any-promise": "^1.0.0",+ "object-assign": "^4.0.1",+ "thenify-all": "^1.0.0"+ }+ },"node_modules/nanoid": {"version": "4.0.1","resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.1.tgz",@@ -5397,18 +5488,6 @@"node": ">=0.10.0"}},- "node_modules/normalize-url": {- "version": "6.1.0",- "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",- "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",- "dev": true,- "engines": {- "node": ">=10"- },- "funding": {- "url": "https://github.com/sponsors/sindresorhus"- }- },"node_modules/npm-normalize-package-bin": {"version": "3.0.0","resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz",@@ -5607,6 +5686,44 @@"url": "https://github.com/sponsors/sindresorhus"}},+ "node_modules/openapi-typescript": {+ "version": "6.2.1",+ "resolved": "https://registry.npmjs.org/openapi-typescript/-/openapi-typescript-6.2.1.tgz",+ "integrity": "sha512-l0u3fWE7vOCSWl/FxNcB3zu/jDqi/NUCP7MSbffpCZdBwQAbljHbo+CAjPXpf47SAVE+F7ZQKOew+pnXfV1oGA==",+ "dev": true,+ "dependencies": {+ "ansi-colors": "^4.1.3",+ "fast-glob": "^3.2.12",+ "js-yaml": "^4.1.0",+ "supports-color": "^9.3.1",+ "undici": "^5.21.0",+ "yargs-parser": "^21.1.1"+ },+ "bin": {+ "openapi-typescript": "bin/cli.js"+ }+ },+ "node_modules/openapi-typescript-fetch": {+ "version": "1.1.3",+ "resolved": "https://registry.npmjs.org/openapi-typescript-fetch/-/openapi-typescript-fetch-1.1.3.tgz",+ "integrity": "sha512-smLZPck4OkKMNExcw8jMgrMOGgVGx2N/s6DbKL2ftNl77g5HfoGpZGFy79RBzU/EkaO0OZpwBnslfdBfh7ZcWg==",+ "engines": {+ "node": ">= 12.0.0",+ "npm": ">= 7.0.0"+ }+ },+ "node_modules/openapi-typescript/node_modules/supports-color": {+ "version": "9.3.1",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.3.1.tgz",+ "integrity": "sha512-knBY82pjmnIzK3NifMo3RxEIRD9E0kIzV4BKcyTZ9+9kWgLMxd4PrsTSMoFQUabgRBbF8KOLRDCyKgNV+iK44Q==",+ "dev": true,+ "engines": {+ "node": ">=12"+ },+ "funding": {+ "url": "https://github.com/chalk/supports-color?sponsor=1"+ }+ },"node_modules/optionator": {"version": "0.9.1","resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",@@ -5738,6 +5855,15 @@"node": ">=0.10.0"}},+ "node_modules/pirates": {+ "version": "4.0.5",+ "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz",+ "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",+ "dev": true,+ "engines": {+ "node": ">= 6"+ }+ },"node_modules/postcss": {"version": "8.4.21","resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",@@ -5776,9 +5902,9 @@}},"node_modules/postcss-colormin": {- "version": "5.3.1",- "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",- "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-6.0.0.tgz",+ "integrity": "sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw==","dev": true,"dependencies": {"browserslist": "^4.21.4",@@ -5787,71 +5913,71 @@"postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-convert-values": {- "version": "5.1.3",- "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",- "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz",+ "integrity": "sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw==","dev": true,"dependencies": {"browserslist": "^4.21.4","postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-discard-comments": {- "version": "5.1.2",- "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",- "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz",+ "integrity": "sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw==","dev": true,"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-discard-duplicates": {- "version": "5.1.0",- "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",- "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz",+ "integrity": "sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA==","dev": true,"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-discard-empty": {- "version": "5.1.1",- "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",- "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz",+ "integrity": "sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ==","dev": true,"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-discard-overridden": {- "version": "5.1.0",- "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",- "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz",+ "integrity": "sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==","dev": true,"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"@@ -5894,98 +6020,98 @@}},"node_modules/postcss-merge-longhand": {- "version": "5.1.7",- "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",- "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz",+ "integrity": "sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg==","dev": true,"dependencies": {"postcss-value-parser": "^4.2.0",- "stylehacks": "^5.1.1"+ "stylehacks": "^6.0.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-merge-rules": {- "version": "5.1.4",- "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",- "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-6.0.0.tgz",+ "integrity": "sha512-rCXkklftzEkniyv3f4mRCQzxD6oE4Quyh61uyWTUbCJ26Pv2hoz+fivJSsSBWxDBeScR4fKCfF3HHTcD7Ybqnw==","dev": true,"dependencies": {"browserslist": "^4.21.4","caniuse-api": "^3.0.0",- "cssnano-utils": "^3.1.0",+ "cssnano-utils": "^4.0.0","postcss-selector-parser": "^6.0.5"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-minify-font-values": {- "version": "5.1.0",- "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",- "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz",+ "integrity": "sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA==","dev": true,"dependencies": {"postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-minify-gradients": {- "version": "5.1.1",- "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",- "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz",+ "integrity": "sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA==","dev": true,"dependencies": {"colord": "^2.9.1",- "cssnano-utils": "^3.1.0",+ "cssnano-utils": "^4.0.0","postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-minify-params": {- "version": "5.1.4",- "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",- "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz",+ "integrity": "sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ==","dev": true,"dependencies": {"browserslist": "^4.21.4",- "cssnano-utils": "^3.1.0",+ "cssnano-utils": "^4.0.0","postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-minify-selectors": {- "version": "5.2.1",- "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",- "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz",+ "integrity": "sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g==","dev": true,"dependencies": {"postcss-selector-parser": "^6.0.5"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"@@ -6011,190 +6137,189 @@}},"node_modules/postcss-normalize-charset": {- "version": "5.1.0",- "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",- "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz",+ "integrity": "sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ==","dev": true,"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-normalize-display-values": {- "version": "5.1.0",- "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",- "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz",+ "integrity": "sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw==","dev": true,"dependencies": {"postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-normalize-positions": {- "version": "5.1.1",- "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",- "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz",+ "integrity": "sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg==","dev": true,"dependencies": {"postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-normalize-repeat-style": {- "version": "5.1.1",- "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",- "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz",+ "integrity": "sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A==","dev": true,"dependencies": {"postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-normalize-string": {- "version": "5.1.0",- "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",- "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz",+ "integrity": "sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w==","dev": true,"dependencies": {"postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-normalize-timing-functions": {- "version": "5.1.0",- "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",- "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz",+ "integrity": "sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg==","dev": true,"dependencies": {"postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-normalize-unicode": {- "version": "5.1.1",- "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",- "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz",+ "integrity": "sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg==","dev": true,"dependencies": {"browserslist": "^4.21.4","postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-normalize-url": {- "version": "5.1.0",- "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",- "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz",+ "integrity": "sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw==","dev": true,"dependencies": {- "normalize-url": "^6.0.1","postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-normalize-whitespace": {- "version": "5.1.1",- "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",- "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz",+ "integrity": "sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw==","dev": true,"dependencies": {"postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-ordered-values": {- "version": "5.1.3",- "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",- "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz",+ "integrity": "sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg==","dev": true,"dependencies": {- "cssnano-utils": "^3.1.0",+ "cssnano-utils": "^4.0.0","postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-reduce-initial": {- "version": "5.1.2",- "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",- "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz",+ "integrity": "sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA==","dev": true,"dependencies": {"browserslist": "^4.21.4","caniuse-api": "^3.0.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-reduce-transforms": {- "version": "5.1.0",- "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",- "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz",+ "integrity": "sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w==","dev": true,"dependencies": {"postcss-value-parser": "^4.2.0"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-selector-parser": {- "version": "6.0.10",- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",- "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",+ "version": "6.0.11",+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",+ "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==","dev": true,"dependencies": {"cssesc": "^3.0.0",@@ -6205,31 +6330,31 @@}},"node_modules/postcss-svgo": {- "version": "5.1.0",- "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",- "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-6.0.0.tgz",+ "integrity": "sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw==","dev": true,"dependencies": {"postcss-value-parser": "^4.2.0",- "svgo": "^2.7.0"+ "svgo": "^3.0.2"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >= 18"},"peerDependencies": {"postcss": "^8.2.15"}},"node_modules/postcss-unique-selectors": {- "version": "5.1.1",- "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",- "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz",+ "integrity": "sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw==","dev": true,"dependencies": {"postcss-selector-parser": "^6.0.5"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"@@ -6288,13 +6413,13 @@}},"node_modules/prisma": {- "version": "4.12.0",- "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.12.0.tgz",- "integrity": "sha512-xqVper4mbwl32BWzLpdznHAYvYDWQQWK2tBfXjdUD397XaveRyAP7SkBZ6kFlIg8kKayF4hvuaVtYwXd9BodAg==",+ "version": "4.13.0",+ "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.13.0.tgz",+ "integrity": "sha512-L9mqjnSmvWIRCYJ9mQkwCtj4+JDYYTdhoyo8hlsHNDXaZLh/b4hR0IoKIBbTKxZuyHQzLopb/+0Rvb69uGV7uA==","devOptional": true,"hasInstallScript": true,"dependencies": {- "@prisma/engines": "4.12.0"+ "@prisma/engines": "4.13.0"},"bin": {"prisma": "build/index.js",@@ -6832,6 +6957,67 @@"resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.3.tgz","integrity": "sha512-85aZYCxweiD5J8yTEbw+E6A27zSnLPNDL0WfPdw3YYodq7WjnTKo0q4dtyQ2gz23iPT8Q9CUyJtAaUNcTxRf5Q=="},+ "node_modules/rpc-websocket-client": {+ "version": "1.1.4",+ "resolved": "https://registry.npmjs.org/rpc-websocket-client/-/rpc-websocket-client-1.1.4.tgz",+ "integrity": "sha512-UDMVcsNDJ3WET+0EFdmseYX+60MOCA3BpgpZ5dbtiGsqHo+9uWfgNbPZ4iGDtNcX+EUhCt/Y7C0fTmUU3CkkWA==",+ "dependencies": {+ "isomorphic-ws": "^4.0.1",+ "uuid": "^3.3.3",+ "ws": "^7.1.2"+ },+ "engines": {+ "node": ">=6.0.0"+ }+ },+ "node_modules/rpc-websocket-client/node_modules/uuid": {+ "version": "3.4.0",+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",+ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",+ "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.",+ "bin": {+ "uuid": "bin/uuid"+ }+ },+ "node_modules/rpc-websocket-client/node_modules/ws": {+ "version": "7.5.9",+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",+ "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",+ "engines": {+ "node": ">=8.3.0"+ },+ "peerDependencies": {+ "bufferutil": "^4.0.1",+ "utf-8-validate": "^5.0.2"+ },+ "peerDependenciesMeta": {+ "bufferutil": {+ "optional": true+ },+ "utf-8-validate": {+ "optional": true+ }+ }+ },+ "node_modules/rpc-websockets": {+ "version": "7.5.1",+ "resolved": "https://registry.npmjs.org/rpc-websockets/-/rpc-websockets-7.5.1.tgz",+ "integrity": "sha512-kGFkeTsmd37pHPMaHIgN1LVKXMi0JD782v4Ds9ZKtLlwdTKjn+CxM9A9/gLT2LaOuEcEFGL98h1QWQtlOIdW0w==",+ "dependencies": {+ "@babel/runtime": "^7.17.2",+ "eventemitter3": "^4.0.7",+ "uuid": "^8.3.2",+ "ws": "^8.5.0"+ },+ "funding": {+ "type": "paypal",+ "url": "https://paypal.me/kozjak"+ },+ "optionalDependencies": {+ "bufferutil": "^4.0.1",+ "utf-8-validate": "^5.0.2"+ }+ },"node_modules/run-parallel": {"version": "1.2.0","resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",@@ -7062,15 +7248,6 @@"node": ">=8"}},- "node_modules/source-map": {- "version": "0.6.1",- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",- "dev": true,- "engines": {- "node": ">=0.10.0"- }- },"node_modules/source-map-js": {"version": "1.0.2","resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",@@ -7094,13 +7271,6 @@"integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg==","dev": true},- "node_modules/stable": {- "version": "0.1.8",- "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",- "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",- "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",- "dev": true- },"node_modules/stop-iteration-iterator": {"version": "1.0.0","resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",@@ -7113,6 +7283,15 @@"node": ">= 0.4"}},+ "node_modules/streamsearch": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",+ "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==",+ "dev": true,+ "engines": {+ "node": ">=10.0.0"+ }+ },"node_modules/string_decoder": {"version": "1.3.0","resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",@@ -7252,21 +7431,72 @@}},"node_modules/stylehacks": {- "version": "5.1.1",- "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",- "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-6.0.0.tgz",+ "integrity": "sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==","dev": true,"dependencies": {"browserslist": "^4.21.4","postcss-selector-parser": "^6.0.4"},"engines": {- "node": "^10 || ^12 || >=14.0"+ "node": "^14 || ^16 || >=18.0"},"peerDependencies": {"postcss": "^8.2.15"}},+ "node_modules/sucrase": {+ "version": "3.32.0",+ "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz",+ "integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",+ "dev": true,+ "dependencies": {+ "@jridgewell/gen-mapping": "^0.3.2",+ "commander": "^4.0.0",+ "glob": "7.1.6",+ "lines-and-columns": "^1.1.6",+ "mz": "^2.7.0",+ "pirates": "^4.0.1",+ "ts-interface-checker": "^0.1.9"+ },+ "bin": {+ "sucrase": "bin/sucrase",+ "sucrase-node": "bin/sucrase-node"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/sucrase/node_modules/commander": {+ "version": "4.1.1",+ "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",+ "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",+ "dev": true,+ "engines": {+ "node": ">= 6"+ }+ },+ "node_modules/sucrase/node_modules/glob": {+ "version": "7.1.6",+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",+ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",+ "dev": true,+ "dependencies": {+ "fs.realpath": "^1.0.0",+ "inflight": "^1.0.4",+ "inherits": "2",+ "minimatch": "^3.0.4",+ "once": "^1.3.0",+ "path-is-absolute": "^1.0.0"+ },+ "engines": {+ "node": "*"+ },+ "funding": {+ "url": "https://github.com/sponsors/isaacs"+ }+ },"node_modules/supabase": {"version": "1.46.5","resolved": "https://registry.npmjs.org/supabase/-/supabase-1.46.5.tgz",@@ -7339,24 +7569,27 @@}},"node_modules/svgo": {- "version": "2.8.0",- "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",- "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",+ "version": "3.0.2",+ "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz",+ "integrity": "sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==","dev": true,"dependencies": {"@trysound/sax": "0.2.0","commander": "^7.2.0",- "css-select": "^4.1.3",- "css-tree": "^1.1.3",- "csso": "^4.2.0",- "picocolors": "^1.0.0",- "stable": "^0.1.8"+ "css-select": "^5.1.0",+ "css-tree": "^2.2.1",+ "csso": "^5.0.5",+ "picocolors": "^1.0.0"},"bin": {"svgo": "bin/svgo"},"engines": {- "node": ">=10.13.0"+ "node": ">=14.0.0"+ },+ "funding": {+ "type": "opencollective",+ "url": "https://opencollective.com/svgo"}},"node_modules/swr": {@@ -7390,20 +7623,20 @@}},"node_modules/tailwindcss": {- "version": "3.2.7",- "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.7.tgz",- "integrity": "sha512-B6DLqJzc21x7wntlH/GsZwEXTBttVSl1FtCzC8WP4oBc/NKef7kaax5jeihkkCEWc831/5NDJ9gRNDK6NEioQQ==",+ "version": "3.3.1",+ "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.1.tgz",+ "integrity": "sha512-Vkiouc41d4CEq0ujXl6oiGFQ7bA3WEhUZdTgXAhtKxSy49OmKs8rEfQmupsfF0IGW8fv2iQkp1EVUuapCFrZ9g==","dev": true,"dependencies": {"arg": "^5.0.2","chokidar": "^3.5.3","color-name": "^1.1.4",- "detective": "^5.2.1","didyoumean": "^1.2.2","dlv": "^1.1.3","fast-glob": "^3.2.12","glob-parent": "^6.0.2","is-glob": "^4.0.3",+ "jiti": "^1.17.2","lilconfig": "^2.0.6","micromatch": "^4.0.5","normalize-path": "^3.0.0",@@ -7417,7 +7650,8 @@"postcss-selector-parser": "^6.0.11","postcss-value-parser": "^4.2.0","quick-lru": "^5.1.1",- "resolve": "^1.22.1"+ "resolve": "^1.22.1",+ "sucrase": "^3.29.0"},"bin": {"tailwind": "lib/cli.js",@@ -7476,19 +7710,6 @@}}},- "node_modules/tailwindcss/node_modules/postcss-selector-parser": {- "version": "6.0.11",- "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",- "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",- "dev": true,- "dependencies": {- "cssesc": "^3.0.0",- "util-deprecate": "^1.0.2"- },- "engines": {- "node": ">=4"- }- },"node_modules/tapable": {"version": "2.2.1","resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",@@ -7552,6 +7773,27 @@"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==","dev": true},+ "node_modules/thenify": {+ "version": "3.3.1",+ "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",+ "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",+ "dev": true,+ "dependencies": {+ "any-promise": "^1.0.0"+ }+ },+ "node_modules/thenify-all": {+ "version": "1.6.0",+ "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",+ "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",+ "dev": true,+ "dependencies": {+ "thenify": ">= 3.1.0 < 4"+ },+ "engines": {+ "node": ">=0.8"+ }+ },"node_modules/throttle-debounce": {"version": "3.0.1","resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-3.0.1.tgz",@@ -7621,6 +7863,12 @@"url": "https://github.com/sponsors/wooorm"}},+ "node_modules/ts-interface-checker": {+ "version": "0.1.13",+ "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",+ "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",+ "dev": true+ },"node_modules/tsconfig-paths": {"version": "3.14.2","resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",@@ -7754,6 +8002,18 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/undici": {+ "version": "5.22.0",+ "resolved": "https://registry.npmjs.org/undici/-/undici-5.22.0.tgz",+ "integrity": "sha512-fR9RXCc+6Dxav4P9VV/sp5w3eFiSdOjJYsbtWfd4s5L5C4ogyuVpdKIVHeW0vV1MloM65/f7W45nR9ZxwVdyiA==",+ "dev": true,+ "dependencies": {+ "busboy": "^1.6.0"+ },+ "engines": {+ "node": ">=14.0"+ }+ },"node_modules/unified": {"version": "10.1.2","resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz",@@ -7954,6 +8214,14 @@"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz","integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="},+ "node_modules/uuid": {+ "version": "8.3.2",+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",+ "bin": {+ "uuid": "dist/bin/uuid"+ }+ },"node_modules/uvu": {"version": "0.5.6","resolved": "https://registry.npmjs.org/uvu/-/uvu-0.5.6.tgz",@@ -8166,13 +8434,24 @@"node": "^14.17.0 || ^16.13.0 || >=18.0.0"}},- "node_modules/xtend": {- "version": "4.0.2",- "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",- "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",- "dev": true,+ "node_modules/ws": {+ "version": "8.13.0",+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",+ "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==","engines": {- "node": ">=0.4"+ "node": ">=10.0.0"+ },+ "peerDependencies": {+ "bufferutil": "^4.0.1",+ "utf-8-validate": ">=5.0.2"+ },+ "peerDependenciesMeta": {+ "bufferutil": {+ "optional": true+ },+ "utf-8-validate": {+ "optional": true+ }}},"node_modules/y18n": {diff --git a/package.json b/package.jsonindex 1e3448b73..ff94d7d28 100644--- a/package.json+++ b/package.json@@ -19,7 +19,7 @@"dev": "npx concurrently -p none \"next dev\" \"npm run start:api\" \"npm run start:playground\"","dev:api-service": "npx concurrently \"npm run start:api\" \"npm run start:playground\"","build": "next build",- "start:api": "cd api-service && cross-env QUART_APP=app:app PYTHONUNBUFFERED=1 QUART_RESPONSE_TIMEOUT=86400 poetry run quart --debug run --reload --port 49155",+ "start:api": "cd api-service && cross-env PYTHONUNBUFFERED=1 poetry run hypercorn app:app --reload --debug --bind ':49155'","start:playground": "cd api-service/playground && npm run dev","install:api-service": "cd api-service && poetry install --with dev && cd playground && npm i","install:all": "npm i && npm run install:api-service",@@ -36,11 +36,12 @@"db:start": "npx --yes supabase start -x imgproxy,storage-api,studio,inbucket,edge-runtime,logflare,postgres-meta,deno-relay,pgadmin-schema-diff,vector,migra","db:stop": "npx --yes supabase stop","db:reset": "npx --yes supabase db reset",- "vale:sync": "vale sync"+ "vale:sync": "vale sync",+ "generate:api-client": "openapi-typescript api-service/openapi.json --support-array-length --alphabetize --output api-client/api/schema.gen.ts"},"dependencies": {"@devbookhq/splitter": "^1.4.0",- "@prisma/client": "^4.12.0",+ "@prisma/client": "^4.13.0","@supabase/auth-helpers-nextjs": "^0.5.5","@supabase/auth-helpers-react": "^0.3.1","@supabase/supabase-js": "^2.10.0",@@ -55,6 +56,7 @@"@tiptap/react": "^2.0.0-beta.220","@tiptap/starter-kit": "^2.0.0-beta.220","clsx": "^1.2.1",+ "cross-fetch": "^3.1.5","fuse.js": "^6.6.2","http-proxy-middleware": "^3.0.0-beta.1","human-id": "^4.0.0",@@ -65,6 +67,7 @@"nanoid": "^4.0.1","next": "13.2.3","next-superjson-plugin": "^0.5.6",+ "openapi-typescript-fetch": "^1.1.3","prosemirror-markdown": "^1.10.1","prosemirror-state": "^1.4.2","prosemirror-view": "^1.30.2",@@ -72,6 +75,8 @@"react-dom": "18.2.0","react-markdown": "^8.0.5","react-textarea-autosize": "^8.4.0",+ "rpc-websocket-client": "^1.1.4",+ "rpc-websockets": "^7.5.1","sharp": "^0.32.0","superjson": "^1.12.2","swr": "^2.0.4",@@ -83,20 +88,20 @@"@tailwindcss/typography": "^0.5.9","@types/mustache": "^4.2.2","@types/node": "^18.14.6",- "@types/randomcolor": "^0.5.7","@types/react": "^18.0.28","@types/react-dom": "^18.0.11","autoprefixer": "^10.4.13","concurrently": "^7.6.0","cross-env": "^7.0.3",- "cssnano": "^5.1.15",+ "cssnano": "^6.0.0","eslint": "^8.35.0","eslint-config-next": "^13.2.3","eslint-plugin-tailwindcss": "^3.10.1","eslint-plugin-unused-imports": "^2.0.0",+ "openapi-typescript": "^6.2.1","postcss": "^8.4.21","postcss-import": "^15.1.0",- "prisma": "^4.12.0",+ "prisma": "^4.13.0","supabase": "^1.46.5","tailwindcss": "^3.2.7","typescript": "^4.9.5"diff --git a/pages/api/service/[...all].ts b/pages/api/service/[...all].tsindex 171422d41..7248d558d 100644--- a/pages/api/service/[...all].ts+++ b/pages/api/service/[...all].ts@@ -1,7 +1,6 @@import { createProxyMiddleware } from 'http-proxy-middleware'import type { NextApiRequest, NextApiResponse } from 'next'-export const config = {api: {responseLimit: false,@@ -21,13 +20,14 @@ const isSecure = target.startsWith('https://')const proxy = createProxyMiddleware<NextApiRequest, NextApiResponse>({target,- // ws: true,+ ws: true,secure: !isSecure,- changeOrigin: true,+ // changeOrigin: false,pathRewrite: { [`^${pathPrefix}`]: '' }, // remove prefix})export default function handler(req: NextApiRequest, res: NextApiResponse) {+ console.log('Proxy', req.url)proxy(req, res, (result: unknown) => {if (result instanceof Error) {throw resultdiff --git a/prisma/schema.prisma b/prisma/schema.prismaindex 43208c2c5..22655ad7c 100644--- a/prisma/schema.prisma+++ b/prisma/schema.prisma@@ -1,7 +1,6 @@generator js {provider = "prisma-client-js"previewFeatures = ["multiSchema", "views"]- engineType = "binary"}datasource db {diff --git a/tsconfig.json b/tsconfig.jsonindex eb9c8ddfb..6f513da4e 100644--- a/tsconfig.json+++ b/tsconfig.json@@ -33,5 +33,6 @@"exclude": ["node_modules","api-service",+ "api-client/api/schema.gen.ts"]}