Merge branch 'run-llama:main' into main

run-llama · Feb 2, 2024 · 10cfec6 · 10cfec6
2 parents 78734da + 4a96830
commit 10cfec6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/llama_hub/confluence/README.md b/llama_hub/confluence/README.md
@@ -3,7 +3,7 @@
 This loader loads pages from a given Confluence cloud instance. The user needs to specify the base URL for a Confluence 
 instance to initialize the ConfluenceReader - base URL needs to end with `/wiki`. The user can optionally specify 
 OAuth 2.0 credentials to authenticate with the Confluence instance. If no credentials are specified, the loader will
-look for `CONFLUENCE_API_TOKEN` or `CONFLUENCE_USERNAME`/`CONFLUENCE_PASSWORD` environment variables to proceed with basic authentication.
+look for `CONFLUENCE_API_TOKEN` or `CONFLUENCE_USERNAME`/`CONFLUENCE_PASSWORD` environment variables to proceed with basic authentication. Keep in mind `CONFLUENCE_PASSWORD` is not your actual password, but an API Token obtained here: https://id.atlassian.com/manage-profile/security/api-tokens.
 
 For more on authenticating using OAuth 2.0, checkout:
 - https://atlassian-python-api.readthedocs.io/index.html

diff --git a/llama_hub/file/paged_csv/base.py b/llama_hub/file/paged_csv/base.py
@@ -3,6 +3,7 @@
 A parser for tabular data files.
 
 """
+
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -26,14 +27,18 @@ def __init__(self, *args: Any, encoding: str = "utf-8", **kwargs: Any) -> None:
         self._encoding = encoding
 
     def load_data(
-        self, file: Path, extra_info: Optional[Dict] = None
+        self,
+        file: Path,
+        extra_info: Optional[Dict] = None,
+        delimiter: str = ",",
+        quotechar: str = '"',
     ) -> List[Document]:
         """Parse file."""
         import csv
 
         docs = []
         with open(file, "r", encoding=self._encoding) as fp:
-            csv_reader = csv.DictReader(fp)  # type: ignore
+            csv_reader = csv.DictReader(f=fp, delimiter=delimiter, quotechar=quotechar)  # type: ignore
             for row in csv_reader:
                 docs.append(
                     Document(

diff --git a/llama_hub/llama_packs/library.json b/llama_hub/llama_packs/library.json
@@ -271,7 +271,7 @@
   "StockMarketDataQueryEnginePack": {
     "id": "llama_packs/stock_market_data_query_engine",
     "author": "anoopshrma",
-    "keywords": ["stock", "market", "data", "query", "engine"]
+    "keywords": ["stock", "market","yahoo","finance","yahoo finance", "data", "query", "engine"]
   },
   "VannaPack": {
     "id": "llama_packs/vanna",

diff --git a/llama_hub/llama_packs/stock_market_data_query_engine/README.md b/llama_hub/llama_packs/stock_market_data_query_engine/README.md
@@ -1,6 +1,6 @@
-# Stock Market Data Query Engine Pack
+# Stock Market Data Query Engine Pack (Yahoo Finance Query Engine)
 
-Query and retrieve historical market data for a list of stock tickers. It utilizes [yfinance](https://pypi.org/project/yfinance/) to fetch historical stock prices.
+Query and retrieve historical market data for a list of stock tickers. It utilizes Yahoo Finance ([yfinance](https://pypi.org/project/yfinance/) ) to fetch historical stock prices.
 
 ## CLI Usage
 

diff --git a/llama_hub/llama_packs/stock_market_data_query_engine/base.py b/llama_hub/llama_packs/stock_market_data_query_engine/base.py
@@ -13,7 +13,7 @@
 
 
 class StockMarketDataQueryEnginePack(BaseLlamaPack):
-    """Historical stock market data query engine pack."""
+    """Historical stock market data query engine pack based on yahoo finance."""
 
     def __init__(
         self,