zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 解决local_model服务端口冲突问题

Browse Source
This commit is contained in:
shaohuzhang1 2024-08-21 16:25:26 +08:00 committed by shaohuzhang1
parent 7a596eb853
commit 63e7e52a35
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/common/management/commands/services/services/local_model.py
View File

@ -23,7 +23,7 @@ class GunicornLocalModelService(BaseService):
print("\n- Start Gunicorn Local Model WSGI HTTP Server") print("\n- Start Gunicorn Local Model WSGI HTTP Server")
os.environ.setdefault('SERVER_NAME', 'local_model') os.environ.setdefault('SERVER_NAME', 'local_model')
log_format = '%(h)s %(t)s %(L)ss "%(r)s" %(s)s %(b)s ' log_format = '%(h)s %(t)s %(L)ss "%(r)s" %(s)s %(b)s '
bind = f'127.0.0.1:5432' bind = f'{CONFIG.get("LOCAL_MODEL_HOST")}:{CONFIG.get("LOCAL_MODEL_PORT")}'
cmd = [ cmd = [
'gunicorn', 'smartdoc.wsgi:application', 'gunicorn', 'smartdoc.wsgi:application',
'-b', bind, '-b', bind,

9
apps/setting/models_provider/impl/local_model_provider/model/embedding.py
View File

@ -14,6 +14,7 @@ from langchain_core.pydantic_v1 import BaseModel
from langchain_huggingface import HuggingFaceEmbeddings from langchain_huggingface import HuggingFaceEmbeddings
from setting.models_provider.base_model_provider import MaxKBBaseModel from setting.models_provider.base_model_provider import MaxKBBaseModel
from smartdoc.const import CONFIG
class WebLocalEmbedding(MaxKBBaseModel, BaseModel, Embeddings): class WebLocalEmbedding(MaxKBBaseModel, BaseModel, Embeddings):
@ -28,14 +29,18 @@ class WebLocalEmbedding(MaxKBBaseModel, BaseModel, Embeddings):
self.model_id = kwargs.get('model_id', None) self.model_id = kwargs.get('model_id', None)
def embed_query(self, text: str) -> List[float]: def embed_query(self, text: str) -> List[float]:
res = requests.post(f'http://127.0.0.1:5432/api/model/{self.model_id}/embed_query', {'text': text}) bind = f'{CONFIG.get("LOCAL_MODEL_HOST")}:{CONFIG.get("LOCAL_MODEL_PORT")}'
res = requests.post(f'{CONFIG.get("LOCAL_MODEL_PROTOCOL")}://{bind}/api/model/{self.model_id}/embed_query',
{'text': text})
result = res.json() result = res.json()
if result.get('code', 500) == 200: if result.get('code', 500) == 200:
return result.get('data') return result.get('data')
raise Exception(result.get('msg')) raise Exception(result.get('msg'))
def embed_documents(self, texts: List[str]) -> List[List[float]]: def embed_documents(self, texts: List[str]) -> List[List[float]]:
res = requests.post(f'http://127.0.0.1:5432/api/model/{self.model_id}/embed_documents', {'texts': texts}) bind = f'{CONFIG.get("LOCAL_MODEL_HOST")}:{CONFIG.get("LOCAL_MODEL_PORT")}'
res = requests.post(f'{CONFIG.get("LOCAL_MODEL_PROTOCOL")}://{bind}/api/model/{self.model_id}/embed_documents',
{'texts': texts})
result = res.json() result = res.json()
if result.get('code', 500) == 200: if result.get('code', 500) == 200:
return result.get('data') return result.get('data')

5
apps/smartdoc/conf.py
View File

@ -88,7 +88,10 @@ class Config(dict):
# 向量库配置 # 向量库配置
"VECTOR_STORE_NAME": 'pg_vector', "VECTOR_STORE_NAME": 'pg_vector',
"DEBUG": False, "DEBUG": False,
'SANDBOX': False 'SANDBOX': False,
'LOCAL_MODEL_HOST': '127.0.0.1',
'LOCAL_MODEL_PORT': '11636',
'LOCAL_MODEL_PROTOCOL': "http"
} }

4
main.py
View File

@ -75,7 +75,9 @@ def dev():
management.call_command('celery', 'celery') management.call_command('celery', 'celery')
elif services.__contains__('local_model'): elif services.__contains__('local_model'):
os.environ.setdefault('SERVER_NAME', 'local_model') os.environ.setdefault('SERVER_NAME', 'local_model')
management.call_command('runserver', "127.0.0.1:5432") from smartdoc.const import CONFIG
bind = f'{CONFIG.get("LOCAL_MODEL_HOST")}:{CONFIG.get("LOCAL_MODEL_PORT")}'
management.call_command('runserver', bind)
if __name__ == '__main__': if __name__ == '__main__':