Merge pull request #42 from Zochory/v0.5.0-branch

V0.5.11 branch
Qredence · Aug 22, 2024 · 932ae56 · 932ae56
2 parents a0e2a34 + 4309e86
commit 932ae56
Show file tree

Hide file tree

Showing 64 changed files with 112,553 additions and 6,383 deletions.
diff --git a/.env.exemple b/.env.exemple
@@ -1,6 +1,6 @@
-GRAPHRAG_API_KEY="fd7763c639184c20962857cacacd1a38"
-GRAPHRAG_API_BASE="https://gpt-4o-fr.openai.azure.com" #optionnal , needed if using custom endpoint
-GRAPHRAG_API_VERSION="turbo-2024-04-09"
-GRAPHRAG_LLM_MODEL="gpt-4"
-GRAPHRAG_DEPLOYMENT_NAME="gpt-4"
-GRAPHRAG_EMBEDDING_MODEL="text-embedding-ada-002"
+GRAPHRAG_API_KEY="your_api_key_here"
+GRAPHRAG_API_BASE="your_api_base_url_here"
+GRAPHRAG_API_VERSION="your_api_version_here"
+GRAPHRAG_LLM_MODEL="your_llm_model_here"
+GRAPHRAG_DEPLOYMENT_NAME="your_deployment_name_here"
+GRAPHRAG_EMBEDDING_MODEL="your_embedding_model_here"
diff --git a/.gitignore b/.gitignore
@@ -38,7 +38,7 @@ tests/fixtures/*/cache
 tests/fixtures/*/output
 lancedb/
 graphfleet/cache
-
+graphfleet/libs/graphrag/
 # Random
 .DS_Store
 *.log*

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -24,5 +24,6 @@
         "**/*tsconfig.json": true,
         ".cache": true,
         "retool.config.json": true
-    }
+    },
+    "python.analysis.autoImportCompletions": true
 }
diff --git a/README.md b/README.md
@@ -81,13 +81,16 @@ GraphFleet uses knowledge graphs to provide substantial improvements in question
 1. Configuration:
 Environment Variables: Set up your environment variables in a .env file (refer to the .env.example file for available options). Key variables include:
 
-   ```sh
-   export GRAPHRAG_API_KEY="your API key"
-   export GRAPHRAG_API_BASE="your API endpoint if you use Azure OpenAI"
-   export GRAPHRAG_API_VERSION="2024-04-01-preview"
-   export GRAPHRAG_LLM_MODEL="gpt-4o or gpt-4"
-   export GRAPHRAG_DEPLOYMENT_NAME="model name"
-   export GRAPHRAG_EMBEDDING_MODEL="embedding model"
+Fill in the .env file in the root folder and the one in the graphfleet folder.
+
+    ```sh
+   export GRAPHRAG_API_KEY="your_api_key_here"
+   export GRAPHRAG_API_BASE="your_api_base_url_here"
+   export GRAPHRAG_API_VERSION="your_api_version_here"
+   export GRAPHRAG_LLM_MODEL="your_llm_model_here"
+   export GRAPHRAG_DEPLOYMENT_NAME="your_deployment_name_here"
+   export GRAPHRAG_EMBEDDING_MODEL="your_embedding_model_here"
+
    ```
 
    settings.yaml: Customize GraphFleet's behavior further by modifying the settings.yaml file within the graphfleet directory.

diff --git a/api.txt b/api.txt
diff --git a/app.py b/app.py
diff --git a/dictionary.txt b/dictionary.txt
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-
-=======
-# Team
-Alonso
->>>>>>> origin/main
 
 # Pythonisms
 PYTHONPATH
@@ -101,15 +95,12 @@ retryer
 agenerate
 aembed
 dedupe
-<<<<<<< HEAD
 GRAPHRAG
 graphrag
 GraphFleet
 graphfleet
 Qredence
-
-=======
->>>>>>> origin/main
+pydantic
 
 # LLM Terms
 AOAI
@@ -136,43 +127,13 @@ docstore
 datasource
 devcontainers
 codebases
-<<<<<<< HEAD
-gfleetenv
-
-=======
-
-# Microsoft
-MSRC
->>>>>>> origin/main
 
 # Broken Upstream
 # TODO FIX IN DATASHAPER
 Arrary
 
 # Prompt Inputs
-ABILA
-Abila
-ALHAMIA
-Alhamia
-Asadi
-Aurelians
-Bataglani
-BATAGLANI
-Bratinas
-dulce
-Durke
-Firuzabad
-Firuzabad's
-FIRUZABAD
-Krohaara
-KROHAARA
-POKRALLY
-Tazbah
-TIRUZIA
-Tiruzia
-Tiruzia's
-Verdantis
-Verdantis's
+
 
 
 # English

diff --git a/graphfleet/.env.exemple b/graphfleet/.env.exemple
@@ -1,6 +1,6 @@
-GRAPHRAG_API_KEY="your api key"
-GRAPHRAG_API_BASE="base_url" #optionnal , needed if using custom endpoint
-GRAPHRAG_API_VERSION="2023-05-13"
-GRAPHRAG_LLM_MODEL="gpt-4o"
-GRAPHRAG_DEPLOYMENT_NAME="gpt-4o"
-GRAPHRAG_EMBEDDING_MODEL="text-embedding-ada-002"
+GRAPHRAG_API_KEY="your_api_key_here"
+GRAPHRAG_API_BASE="your_api_base_url_here"
+GRAPHRAG_API_VERSION="your_api_version_here"
+GRAPHRAG_LLM_MODEL="your_llm_model_here"
+GRAPHRAG_DEPLOYMENT_NAME="your_deployment_name_here"
+GRAPHRAG_EMBEDDING_MODEL="your_embedding_model_here"
diff --git a/graphfleet/api/api.py b/graphfleet/api/api.py