chore:v0.6.1 version (#2083)

dbgpt/_version.py

@@ -1 +1 @@
-version = "0.6.0"
+version = "0.6.1"

dbgpt/serve/evaluate/api/endpoints.py

@@ -6,11 +6,9 @@
 from fastapi.security.http import HTTPAuthorizationCredentials, HTTPBearer
 
 from dbgpt.component import ComponentType, SystemApp
-from dbgpt.core.interface.evaluation import metric_manage
 from dbgpt.model.cluster import BaseModelController, WorkerManager, WorkerManagerFactory
-from dbgpt.rag.evaluation.answer import AnswerRelevancyMetric
 from dbgpt.serve.core import Result
-from dbgpt.serve.evaluate.api.schemas import EvaluateServeRequest, EvaluateServeResponse
+from dbgpt.serve.evaluate.api.schemas import EvaluateServeRequest
 from dbgpt.serve.evaluate.config import SERVE_SERVICE_COMPONENT_NAME
 from dbgpt.serve.evaluate.service.service import Service
 

dbgpt/serve/evaluate/api/schemas.py

@@ -1,5 +1,5 @@
 from enum import Enum
-from typing import Any, Dict, List, Optional
+from typing import List, Optional
 
 from dbgpt._private.pydantic import BaseModel, Field
 
@@ -11,11 +11,6 @@ class EvaluationScene(Enum):
     APP = "app"
 
 
-class DatasetStorageType(Enum):
-    OSS = "oss"
-    DB = "db"
-
-
 class EvaluateServeRequest(BaseModel):
     evaluate_code: Optional[str] = Field(None, description="evaluation code")
     scene_key: Optional[str] = Field(None, description="evaluation scene key")
@@ -42,22 +37,3 @@ class EvaluateServeRequest(BaseModel):
 class EvaluateServeResponse(EvaluateServeRequest):
     class Config:
         title = f"EvaluateServeResponse for {SERVE_APP_NAME_HUMP}"
-
-
-class DatasetServeRequest(BaseModel):
-    code: Optional[str] = Field(None, description="dataset code")
-    name: Optional[str] = Field(None, description="dataset name")
-    file_type: Optional[str] = Field(None, description="dataset file type")
-    storage_type: Optional[str] = Field(None, comment="datasets storage type")
-    storage_position: Optional[str] = Field(None, comment="datasets storage position")
-    datasets_count: Optional[int] = Field(None, comment="datasets row count")
-    have_answer: Optional[bool] = Field(None, comment="datasets have answer")
-    members: Optional[str] = Field(None, comment="datasets manager members")
-    user_name: Optional[str] = Field(None, description="user name")
-    user_id: Optional[str] = Field(None, description="user id")
-    sys_code: Optional[str] = Field(None, description="system code")
-
-
-class DatasetServeResponse(DatasetServeRequest):
-    gmt_create: Optional[str] = Field(None, description="create time")
-    gmt_modified: Optional[str] = Field(None, description="create time")

dbgpt/serve/evaluate/models/models.py

@@ -6,13 +6,13 @@
 from datetime import datetime
 from typing import Any, Dict, Union
 
-from sqlalchemy import Column, DateTime, Index, Integer, String, Text, UniqueConstraint
+from sqlalchemy import Column, DateTime, Integer, String, Text, UniqueConstraint
 
 from dbgpt.agent.core.schema import Status
-from dbgpt.storage.metadata import BaseDao, Model, db
+from dbgpt.storage.metadata import BaseDao, Model
 
 from ..api.schemas import EvaluateServeRequest, EvaluateServeResponse
-from ..config import SERVER_APP_TABLE_NAME, ServeConfig
+from ..config import ServeConfig
 
 
 class ServeEntity(Model):

dbgpt/serve/evaluate/service/service.py

@@ -1,6 +1,3 @@
-import asyncio
-import io
-import json
 import logging
 from concurrent.futures import ThreadPoolExecutor
 from typing import List, Optional
@@ -19,14 +16,14 @@
 from dbgpt.rag.evaluation import RetrieverEvaluator
 from dbgpt.rag.evaluation.answer import AnswerRelevancyMetric
 from dbgpt.rag.evaluation.retriever import RetrieverSimilarityMetric
-from dbgpt.serve.core import BaseService
 from dbgpt.serve.rag.operators.knowledge_space import SpaceRetrieverOperator
 from dbgpt.storage.metadata import BaseDao
 from dbgpt.storage.vector_store.base import VectorStoreConfig
 
 from ...agent.agents.controller import multi_agents
 from ...agent.evaluation.evaluation import AgentEvaluator, AgentOutputOperator
 from ...agent.evaluation.evaluation_metric import IntentMetric
+from ...core import BaseService
 from ...prompt.service.service import Service as PromptService
 from ...rag.connector import VectorStoreConnector
 from ...rag.service.service import Service as RagService
@@ -70,7 +67,6 @@ def init_app(self, system_app: SystemApp) -> None:
         self._serve_config = ServeConfig.from_app_config(
             system_app.config, SERVE_CONFIG_KEY_PREFIX
         )
-        self._dao = self._dao or ServeDao(self._serve_config)
         self._system_app = system_app
 
     @property

setup.py

@@ -20,7 +20,7 @@
 IS_DEV_MODE = os.getenv("IS_DEV_MODE", "true").lower() == "true"
 # If you modify the version, please modify the version in the following files:
 # dbgpt/_version.py
-DB_GPT_VERSION = os.getenv("DB_GPT_VERSION", "0.6.0")
+DB_GPT_VERSION = os.getenv("DB_GPT_VERSION", "0.6.1")
 
 BUILD_NO_CACHE = os.getenv("BUILD_NO_CACHE", "true").lower() == "true"
 LLAMA_CPP_GPU_ACCELERATION = (