diff --git a/.gitignore b/.gitignore index 15cba9e6..2d3f1173 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,13 @@ *.log *.log.* *.bak -/chatchat/chatchat/data/* -!/chatchat/chatchat/data/knowledge_base/samples -/chatchat/chatchat/data/knowledge_base/samples/vector_store -!/chatchat/chatchat/data/nltk_data +/chatchat-server/chatchat/data/* +!/chatchat-server/chatchat/data/knowledge_base/samples +/chatchat-server/chatchat/data/knowledge_base/samples/vector_store +!/chatchat-server/chatchat/data/nltk_data -/chatchat/chatchat/configs/*.py -/chatchat/chatchat/configs/loom.yaml +/chatchat-server/chatchat/configs/*.py +/chatchat-server/chatchat/configs/loom.yaml .vscode/ # below are standard python ignore files diff --git a/chatchat-server/chatchat/server/api_server/api_schemas.py b/chatchat-server/chatchat/server/api_server/api_schemas.py index a46ec31c..1db27e2a 100644 --- a/chatchat-server/chatchat/server/api_server/api_schemas.py +++ b/chatchat-server/chatchat/server/api_server/api_schemas.py @@ -4,7 +4,7 @@ import re from typing import Dict, List, Literal, Optional, Union from fastapi import UploadFile -from chatchat.server.pydantic_v1 import BaseModel, Field, AnyUrl, root_validator +from chatchat.server.pydantic_v2 import BaseModel, Field, AnyUrl, root_validator from openai.types.chat import ( ChatCompletionMessageParam, ChatCompletionToolChoiceOptionParam,