diff --git a/Dockerfile b/Dockerfile index 614842c0..593e963b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,11 +22,6 @@ RUN echo '[global]' > /etc/pip.conf && \ echo 'index-url = https://mirrors.aliyun.com/pypi/simple/' >> /etc/pip.conf && \ echo 'trusted-host = mirrors.aliyun.com' >> /etc/pip.conf -# # (Not necessary) Install the majority of deps, using docker build cache to accelerate future building -# COPY requirements.txt ./ -# RUN pip3 install poetry -# RUN poetry install - # Install Elastic Search RUN useradd -m elastic_search_user USER elastic_search_user @@ -47,9 +42,9 @@ WORKDIR /memory_scope_project # Enter working dir WORKDIR /memory_scope_project COPY . . -RUN pip3 install poetry -# RUN pip install -r requirements.txt -RUN poetry install +# RUN pip3 install poetry +RUN pip install -r requirements.txt +# RUN poetry install # Launch! # CMD ["bash"] diff --git a/memoryscope/__init__.py b/memoryscope/__init__.py index 8784080c..a5d21147 100644 --- a/memoryscope/__init__.py +++ b/memoryscope/__init__.py @@ -1,7 +1,5 @@ """ Version of MemoryScope.""" -import importlib.metadata -__version__ = importlib.metadata.version("memoryscope") - +__version__ = "0.1.1.0" import fire from memoryscope.core.config.arguments import Arguments # noqa: F401 diff --git a/quick-start-demo.py b/quick-start-demo.py index 4987e6ba..0476c4a9 100644 --- a/quick-start-demo.py +++ b/quick-start-demo.py @@ -1,7 +1,13 @@ import os -if os.environ.get('DASHSCOPE_API_KEY', None) is None and os.environ.get('API_KEY', None) is None: - os.environ['DASHSCOPE_API_KEY'] = input('Missing api key from dashscope ( `https://help.aliyun.com/zh/model-studio/developer-reference/get-api-key` ), please input key and press Enter:') +if os.environ.get('DASHSCOPE_API_KEY', None) is None \ + and os.environ.get('API_KEY', None) is None: + os.environ['DASHSCOPE_API_KEY'] = \ + input( + '\n\n' + 'Missing api key from dashscope ( `https://help.aliyun.com/zh/model-studio/developer-reference/get-api-key` ), ' + 'please input key and press Enter:' + ) from memoryscope import cli cli() \ No newline at end of file diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..f11ee292 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,16 @@ +llama-index-core>=0.10.45 +llama-index-embeddings-dashscope>=0.1.3 +llama-index-llms-dashscope>=0.1.2 +llama-index-postprocessor-dashscope-rerank-custom>=0.1.0 +llama-index-vector-stores-elasticsearch>=0.2.0 +pyfiglet>=1.0.2 +termcolor>=2.4.0 +llama-index>=0.10.45 +fire>=0.6.0 +questionary>=2.0.1 +pydantic>=2.7.1 +dashscope>=1.19.1 +elasticsearch>=8.14.0 +pyyaml>=6.0.1 +numpy>=1.26.4 +rich>=13.0.0 \ No newline at end of file