Skip to content

Commit

Permalink
Resolve merge conflict by incorporating both suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
ysu132 committed Jul 23, 2024
2 parents 29d629b + f1067d3 commit 4002971
Show file tree
Hide file tree
Showing 5 changed files with 114 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This is an open source set of projects to enhance and enrich the tasks and capabilities of academic researchers using AI. Initially, there are two (sub) projects: tell_von which helps organize notes and files, and paper_recommender which organizes and distributes paper recommendations and references.

Hopefully this will become a family of Agents for Assisted Science and beyond.
We intend that this will become a family of Agents for Assisted Science and beyond.

 
 
Expand Down
13 changes: 13 additions & 0 deletions paper_recommender/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
-e "git+https://github.com/Strong-AI-Lab/Von.git@a46877f9f34afcbcb986f06241129041a7df7e90#egg=paper_recommender&subdirectory=paper_recommender"
bs4==0.0.2
bson==0.5.10
configparser==7.0.0
dataclasses==0.6
DateTime==5.5
feedparser==6.0.11
openai==1.35.9
pathlib==1.0.1
pymongo==4.8.0
requests==2.32.3
slack_bolt==1.19.1
typing==3.7.4.3
6 changes: 5 additions & 1 deletion src/paper_recommender/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,8 @@ Once all the required packages have been installed, start the app by running `pa
- I suggest create a brand new copy of the app and database by following this readme. It serves two purposes:
- It helps find out problems in this readme.
- There should ideally be two copies of the app and database. One for deployment, another one for development. Only the deployment version should be installed to public channels like the literature channel. The development version can be installed to a new channel dedicated to development.
- I suggest avoid pushing any commits directly into the `main` branch. When developing new features, use the `dev` branch instead, or creating new branches. Then you can submit pull request to merge the changes into the `main ` branch.
- I suggest avoid pushing any commits directly into the `main` branch. When developing new features, use the `dev` branch instead, or creating new branches. Then you can submit pull request to merge the changes into the `main` branch.

- A VCS line like `-e "git+https://..."` may cause issues when installing dependencies using `pip install -r requirements.txt`.
- I suggest that developers who are not the repository owners but have authentication access create a Personal Access Token (PAT) and insert it properly into that line. Fortunately, this issue won't occur once the repository is set to public.
- Further, ensure that your `pip` is upgraded before installing the dependencies by running `pip install --upgrade pip`. This prevents issues arising from older versions of `pip` that do not support `pyproject.toml`.
54 changes: 54 additions & 0 deletions src/paper_recommender/dependencies.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
bs4==0.0.2
└── beautifulsoup4 [required: Any, installed: 4.12.3]
└── soupsieve [required: >1.2, installed: 2.5]
bson==0.5.10
├── python-dateutil [required: >=2.4.0, installed: 2.9.0.post0]
│ └── six [required: >=1.5, installed: 1.16.0]
└── six [required: >=1.9.0, installed: 1.16.0]
configparser==7.0.0
dataclasses==0.6
DateTime==5.5
├── pytz [required: Any, installed: 2024.1]
└── zope.interface [required: Any, installed: 6.4.post2]
└── setuptools [required: Any, installed: 50.3.2]
feedparser==6.0.11
└── sgmllib3k [required: Any, installed: 1.0.0]
openai==1.35.9
├── anyio [required: >=3.5.0,<5, installed: 4.4.0]
│ ├── exceptiongroup [required: >=1.0.2, installed: 1.2.1]
│ ├── idna [required: >=2.8, installed: 3.7]
│ ├── sniffio [required: >=1.1, installed: 1.3.1]
│ └── typing_extensions [required: >=4.1, installed: 4.12.2]
├── distro [required: >=1.7.0,<2, installed: 1.9.0]
├── httpx [required: >=0.23.0,<1, installed: 0.27.0]
│ ├── anyio [required: Any, installed: 4.4.0]
│ │ ├── exceptiongroup [required: >=1.0.2, installed: 1.2.1]
│ │ ├── idna [required: >=2.8, installed: 3.7]
│ │ ├── sniffio [required: >=1.1, installed: 1.3.1]
│ │ └── typing_extensions [required: >=4.1, installed: 4.12.2]
│ ├── certifi [required: Any, installed: 2024.6.2]
│ ├── httpcore [required: ==1.*, installed: 1.0.5]
│ │ ├── certifi [required: Any, installed: 2024.6.2]
│ │ └── h11 [required: >=0.13,<0.15, installed: 0.14.0]
│ ├── idna [required: Any, installed: 3.7]
│ └── sniffio [required: Any, installed: 1.3.1]
├── pydantic [required: >=1.9.0,<3, installed: 2.8.0]
│ ├── annotated-types [required: >=0.4.0, installed: 0.7.0]
│ ├── pydantic_core [required: ==2.20.0, installed: 2.20.0]
│ │ └── typing_extensions [required: >=4.6.0,!=4.7.0, installed: 4.12.2]
│ └── typing_extensions [required: >=4.6.1, installed: 4.12.2]
├── sniffio [required: Any, installed: 1.3.1]
├── tqdm [required: >4, installed: 4.66.4]
└── typing_extensions [required: >=4.7,<5, installed: 4.12.2]
paper_recommender==0.1.0
pathlib==1.0.1
pymongo==4.8.0
└── dnspython [required: >=1.16.0,<3.0.0, installed: 2.6.1]
requests==2.32.3
├── certifi [required: >=2017.4.17, installed: 2024.6.2]
├── charset-normalizer [required: >=2,<4, installed: 3.3.2]
├── idna [required: >=2.5,<4, installed: 3.7]
└── urllib3 [required: >=1.21.1,<3, installed: 2.2.2]
slack_bolt==1.19.1
└── slack_sdk [required: >=3.25.0,<4, installed: 3.30.0]
typing==3.7.4.3
41 changes: 41 additions & 0 deletions workflows/python-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Publish

on:
release:
types:
- created

jobs:
publish:
runs-on: ubuntu-latest
strategy:
matrix:
package:
- vonlib
permissions:
id-token: write
steps:
- name: Dump GitHub context
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
# Issue ref: https://github.com/actions/setup-python/issues/436
# cache: "pip"
# cache-dependency-path: pyproject.toml
- name: Install build dependencies
run: pip install build
- name: Build distribution
env:
TIANGOLO_BUILD_PACKAGE: ${{ matrix.package }}
run: python -m build
- name: Publish
uses: pypa/[email protected]
- name: Dump GitHub context
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"

0 comments on commit 4002971

Please sign in to comment.