Release 0.1.3

vishalmhjn · Oct 18, 2023 · c361b8e · c361b8e
1 parent 033e491
commit c361b8e
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 44 deletions.
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -4,19 +4,19 @@ jobs:
   build:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.8
-    - name: Install dependencies
-      run: |
-        make install
-    - name: Lint
-      run: |
-        make lint
-    - name: Test
-      env:
-        API_KEY: ${{ secrets.API_KEY }}
-      run: |
-        make test
+      - uses: actions/checkout@v2
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+      - name: Install dependencies
+        run: |
+          make install
+      - name: Lint
+        run: |
+          make lint
+      - name: Test
+        env:
+          API_KEY: ${{ secrets.API_KEY }}
+        run: |
+          make test
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,19 +4,19 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.8
-    - name: Install dependencies
-      run: |
-        make install
-    - name: Lint
-      run: |
-        make lint
-    - name: Test
-      env:
-        API_KEY: ${{ secrets.API_KEY }}
-      run: |
-        make test
+      - uses: actions/checkout@v2
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+      - name: Install dependencies
+        run: |
+          make install
+      - name: Lint
+        run: |
+          make lint
+      - name: Test
+        env:
+          API_KEY: ${{ secrets.API_KEY }}
+        run: |
+          make test
diff --git a/Makefile b/Makefile
@@ -1,6 +1,10 @@
+install:
+	pip install --upgrade pip &&\
+		pip install -r requirements.txt
+
 lint:
-	pylint --disable=R,C scopus_caller/call_scopus.py
-	pylint --disable=R,C scopus_caller/call_semanticscholar.py
+	pylint --disable=R,C scopuscaller/call_scopus.py
+	pylint --disable=R,C scopuscaller/call_semanticscholar.py
 
 format:
 	black *.py

diff --git a/README.md b/README.md
@@ -53,11 +53,11 @@ specifying the DOI of the article. Abstracts for all SCOPUS database articles ar
 
 ## Usage
 
-Import the library and paste the API key.
+Import the library and paste the API key. Then run the following code in **Python3** terminal or Jupyter notebook.
 
 ```sh
 # import the module
-import scopus_caller as sc
+import scopuscaller as sc
 
 # paste the api here
 api_key = ""

diff --git a/scopuscaller/call_semanticscholar.py b/scopuscaller/call_semanticscholar.py
@@ -28,7 +28,7 @@ async def call_api_async(session, doi):
 
 async def fetch_articles_async(df):
     timeout = aiohttp.ClientTimeout(total=10 * 60)
-    connector = aiohttp.TCPConnector(limit=5)
+    connector = aiohttp.TCPConnector(limit=1)
 
     list_doi = list(df["doi"])
     list_abstracts = []
@@ -38,11 +38,15 @@ async def fetch_articles_async(df):
         connector=connector, headers=random_headers(), timeout=timeout
     ) as session:  #
         tasks = [call_api_async(session, doi) for doi in list_doi]
-        results = await asyncio.gather(*tasks, return_exceptions=True)
+        results = await asyncio.gather(*tasks, return_exceptions=False)
 
     for content in results:
-        list_abstracts.append(content["abstract"])
-        list_topics.append(content["topics"])
+        try:
+            list_abstracts.append(content["abstract"])
+            list_topics.append(content["topics"])
+        except:
+            list_abstracts.append("None")
+            list_topics.append("None")
 
     return list_abstracts, list_topics
 
@@ -64,13 +68,13 @@ def get_abstracts(df):
     # Filter out articles with no DOI
     df = df[df.doi != "No Doi"]
 
-    # Print the number of articles with abstracts
-    print(f"Articles with abstracts: {len(df)}")
-
     # Run the asyncio event loop to fetch abstracts and topics asynchronously
     loop = asyncio.get_event_loop()
     list_abstracts, list_topics = loop.run_until_complete(fetch_articles_async(df))
 
+    # Print the number of articles with abstracts
+    print(f"Articles with abstracts: {len(list_abstracts)}")
+
     # Add abstracts and topics to the DataFrame
     df["abstract"] = list_abstracts
     df["topics"] = list_topics

diff --git a/tests/test_call_scopus.py → scopuscaller/test_call_scopus.py b/tests/test_call_scopus.py → scopuscaller/test_call_scopus.py
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = scopus_caller
-version = 0.1.2
+version = 0.1.3
 author = Vishal Mahajan
 author_email = vishal.mahajan@tum.de
 url = https://github.com/vishalmhjn/scopus_caller