add sqlalchemy support and mongodb support #321
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SuperEver
force-pushed
the
sql/support_sqlalchemy
branch
from
6e1f29a to
74f63cb
Compare
added 10 commits
October 25, 2024 17:27
…url 3. estimate token uasge in local llm model
… ProgrammingError), use Exception when Table exists in _create_by_api function 2. Fix regrex error in get_db_init_keywords function when password has special character
wzh1994
reviewed
Dec 10, 2024
| @@ -365,6 +365,8 @@ def forward(self, __input: Union[Tuple[Union[str, Dict], str], str, Dict] = pack | |||
| headers = {'Content-Type': 'application/json'} | |||
| text_input_for_token_usage = __input | |||
|
|
|||
| usage = {"prompt_tokens": self._estimate_token_usage(__input), "completion_tokens": 0} | |||
There was a problem hiding this comment.
这个是什么作用？TrainableModule会覆盖这个变量，非TrainableModule则用不上
| if db_type not in self.DB_TYPE_SUPPORTED: | ||
| return DBResult(status=DBStatus.FAIL, detail=f"{db_type} not supported") | ||
| if db_type in self.DB_DRIVER_MAP: | ||
| conn_url = f"{db_type}+{self.DB_DRIVER_MAP[db_type]}://{user}:{password}@{host}:{port}/{db_name}" |
There was a problem hiding this comment.
这个url拼完会是mysql+pymysql://{user}:{password}@{host}:{port}/{db_name}，确认一下是合法的？
|
|
||
| @property | ||
| def desc(self): | ||
| return self._desc |
|
|
||
| @property | ||
| def db_type(self): | ||
| return self._db_type |
There was a problem hiding this comment.
基类的方法不能使用子类定义的变量，可以直接在34行赋值给self
| return False | ||
|
|
||
| def _validate_desc(self, d): | ||
| return isinstance(d, dict) and all(self._is_str_or_nested_dict(v) for v in d.values()) |
There was a problem hiding this comment.
return isinstance(d, dict) and self._is_str_or_nested_dict(d)
|
|
||
| __all__ = ["SqlCall", "SQLiteManger", "SqlManager"] |
wzh1994
reviewed
Dec 12, 2024
| if result.status != DBStatus.SUCCESS: | ||
| return result | ||
| """ | ||
| if db_name not in self.client.list_database_names(): |
| raise ValueError(db_result.detail) | ||
|
|
||
| @overload | ||
| def reset_engine(self, db_type, user, password, host, port, db_name, options_str) -> DBResult: |
There was a problem hiding this comment.
为什么要提供一个reset_engine的对外接口？什么场景下会对一个已经创建的SqlManager做重置呀
There was a problem hiding this comment.
看起来只有sql这一支使用了这个函数，是不是应该放到sqlmanagerbase中定义
| if db_result.status != DBStatus.SUCCESS: | ||
| raise ValueError(db_result.detail) | ||
|
|
||
| @overload |
| if self.status != DBStatus.SUCCESS: | ||
| raise ValueError(self.detail) | ||
|
|
||
| def reset_client(self, user, password, host, port, db_name, collection_name, options_str="") -> DBResult: |
| result: Union[List, None] = None | ||
|
|
||
|
|
||
| class DBManager(ABC): |
There was a problem hiding this comment.
图中是有forward的，但我没看到基类和MongoDB有实现forward
| super().__init__(db_type, user, password, host, port, db_name, options_str) | ||
|
|
||
| def reset_engine( | ||
| self, |
There was a problem hiding this comment.
参数统一都放紧凑一点吧，即尽量减少参数的行数，与前后保持风格一致
| self._db_type = "mongodb" | ||
| self.status = DBStatus.SUCCESS | ||
| self.detail = "" | ||
| conn_url = f"{self._db_type}://{user}:{password}@{host}:{port}/" |
|
|
||
| def check_connection(self) -> DBResult: | ||
| try: | ||
| # check connection status |
| self._collection.delete_one(filter) | ||
|
|
||
| def select(self, query, projection: dict[str, bool] = None, limit: int = None): | ||
| if limit is None: |
There was a problem hiding this comment.
result = self._collection.find(query, projection)
if limit: result = result.limit(limit)
| def execute_to_json(self, statement) -> str: | ||
| dbresult = self.execute(statement) | ||
| if dbresult.status != DBStatus.SUCCESS: | ||
| self.status, self.detail = dbresult.status, dbresult.detail |
wzh1994
reviewed
Dec 12, 2024
|
|
||
| self._engine = sqlalchemy.create_engine(self._conn_url) | ||
| self._desc = "" | ||
| extra_fields = {} |
| return DBResult() | ||
|
|
||
| @property | ||
| def desc(self) -> str: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.