Add object storage #213
Merged
Add object storage #213
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
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## dev #213 +/- ##
==========================================
- Coverage 92.89% 91.37% -1.52%
==========================================
Files 42 47 +5
Lines 1365 1496 +131
==========================================
+ Hits 1268 1367 +99
- Misses 97 129 +32
|
junjiejiangjjj
force-pushed
the
dev_obj
branch
6 times, most recently
from
0face8e
to
328396e
Compare
SimFG
reviewed
Apr 16, 2023
gptcache/adapter/adapter.py
Outdated
| "question": cache_question, | ||
| "answer": cache_answer, | ||
| "question": ret.question, | ||
| "answer": ret.answer[0].answer, |
gptcache/adapter/adapter.py
Outdated
| }, | ||
| extra_param=context.get("evaluation_func", None), | ||
| ) | ||
| if rank_threshold <= rank: | ||
| cache_answers.append((rank, cache_answer)) | ||
| cache_answers.append((rank, ret.answer[0].answer)) |
gptcache/manager/data_manager.py
Outdated
| @@ -180,10 +188,16 @@ def import_data( | |||
| normalize(embedding_data) for embedding_data in embedding_datas | |||
| ] | |||
| for i, embedding_data in enumerate(embedding_datas): | |||
| if not isinstance(answers[i], str): | |||
There was a problem hiding this comment.
maybe is a list, one question multiple answers
gptcache/manager/data_manager.py
Outdated
| self.import_data([question], [answer], [embedding_data]) | ||
|
|
||
| def _process_answers(self, answers: Union[Answer, List[Answer]]): |
There was a problem hiding this comment.
_process_answers -> _process_answer_data
| """Local object storage | ||
| """ | ||
|
|
||
| def __init__(self, local_root): |
There was a problem hiding this comment.
add param type, like: local_root: str
| try: | ||
| os.remove(obj) | ||
| except Exception: # pylint: disable=broad-except | ||
| pass |
| def get(name, **kwargs): | ||
| if name == "local": | ||
| from gptcache.manager.object_data.local_storage import LocalObjectStorage # pylint: disable=import-outside-toplevel | ||
| object_base = LocalObjectStorage(kwargs.get("path", "./")) |
There was a problem hiding this comment.
the default value ./local_obj may be more suitable
| elif name == "s3": | ||
| from gptcache.manager.object_data.s3_storage import S3Storage # pylint: disable=import-outside-toplevel | ||
| object_base = S3Storage(kwargs.get("path_prefix"), kwargs.get("bucket"), | ||
| kwargs.get("access_key"), kwargs.get("secret_key")) |
gptcache/manager/scalar_data/base.py
Outdated
| question: Any | ||
| answer: Union[Any, List[Any]] | ||
| answer: List[Answer] |
Signed-off-by: junjie.jiang <junjie.jiang@zilliz.com>
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: junjiejiangjjj, SimFG The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
SimFG
pushed a commit
that referenced
this pull request
Apr 17, 2023
Signed-off-by: junjie.jiang <junjie.jiang@zilliz.com>
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.