fix conflicts and merge with master

Author: DninoAdnane

.circleci/config.yml

@@ -21,12 +21,19 @@ jobs:
             # Copy settings file
             aws s3 cp $S3PATH edenai_apis/api_keys --recursive
 
+
+      - run: 
+         name: Install Poetry
+         command: |
+          curl -sSL https://install.python-poetry.org | python3 -
+          echo "$HOME/.local/bin" >> $GITHUB_PATH  # Ensure Poetry is in PATH
+
       - run:
           name: Install dependencies
           command: |
             sudo apt-get update
             sudo apt-get install ffmpeg -y
-            pip install -r requirements.txt
+            poetry install --no-interaction --no-root
 
       - run:
           name: Test
@@ -64,12 +71,19 @@ jobs:
             pip install awscli --upgrade
             # Copy settings file
             aws s3 cp $S3PATH edenai_apis/api_keys --recursive
+
+      - run: 
+         name: Install Poetry
+         command: |
+          curl -sSL https://install.python-poetry.org | python3 -
+          echo "$HOME/.local/bin" >> $GITHUB_PATH  # Ensure Poetry is in PATH
+
       - run:
           name: Install dependencies
           command: |
             sudo apt-get update
             sudo apt-get install ffmpeg -y
-            pip install -e .
+            poetry install --no-interaction --no-root
             
       - run:
           name: check working providers
@@ -100,4 +114,4 @@ workflows:
                 - master
                 - release
     jobs:
-     - check_providers
+     - check_providers

.docsrc/conf.py

@@ -7,28 +7,29 @@
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 import os
 import sys
-sys.path.insert(0, os.path.abspath('../'))
 
-project = 'edenai-apis'
-copyright = '2022, Eden AI'
-author = 'Eden AI'
+sys.path.insert(0, os.path.abspath("../"))
+
+project = "edenai-apis"
+copyright = "2022, Eden AI"
+author = "Eden AI"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
 
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.autosummary', 'sphinx.ext.napoleon']
-templates_path = ['_templates']
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+extensions = ["sphinx.ext.autodoc", "sphinx.ext.autosummary", "sphinx.ext.napoleon"]
+templates_path = ["_templates"]
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 autosummary_generate = True
 autodoc_default_options = {
-    'members': True,
+    "members": True,
 }
 napoleon_google_docstring = True
 napoleon_include_private_with_doc = True
 
 # -- Options for HTML output -------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
 
-html_theme = 'furo'
-html_static_path = ['_static']
+html_theme = "furo"
+html_static_path = ["_static"]

.github/workflows/test.yml

@@ -25,44 +25,70 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.12"
+
+      - name: Install Poetry
+        run: |
+          curl -sSL https://install.python-poetry.org | python3 -
+          echo "$HOME/.local/bin" >> $GITHUB_PATH  # Ensure Poetry is in PATH
+
+
+      - name: Debug 
+        run: |
+          git diff HEAD pyproject.toml
+
+      - name: Clear Poetry cache
+        run: poetry cache clear pypi --all
 
       - name: Install dependencies
         run: |
           sudo apt-get update
           sudo apt-get install ffmpeg -y
-          pip install -r requirements.txt -c constraints.txt
+          poetry install --no-interaction --no-root  # Installs dependencies from `poetry.lock`
+
       - name: Set Env variables
         run: "echo TEST_SCOPE=CICD-OPENSOURCE >> $GITHUB_ENV"
+
       - name: Run Test suite
         run: |
-          pytest -vvv -s -n auto --maxprocesses=8 --dist loadgroup
-      - name: generate list of providers and features markdown
+          pytest -vvv -s -m 'unit or integration' -n auto --maxprocesses=8 --dist loadgroup
+
+  generate_doc:
+    needs: test
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+
+      - name: Generate list of providers and features markdown
         run: "python -m edenai_apis.scripts.documentation"
-      - name: generate doc
+
+      - name: Generate doc
         run: |
           cd .docsrc
           rm -rf _build/**
           rm -rf _autosummary/*
           sphinx-apidoc -o _build/ ../edenai_apis/
           make html
           cp -r _build/html/* ../docs/
-      - name: commit documentation changes
+
+      - name: Commit documentation changes
         uses: EndBug/add-and-commit@v9
         with:
           add: AVAILABLES_FEATURES_AND_PROVIDERS.md
           committer_name: Github Action
           committer_email: [email protected]
           message: '[doc] update available features & providers'
 
-
   generate_doc_and_deploy:
-    needs: test
+    needs: generate_doc
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.gitignore

@@ -27,3 +27,4 @@ media
 pyrightconfig.json
 
 *.env*
+.pre-commit-config.yaml

MANIFEST.in

@@ -1,5 +1,13 @@
 include edenai_apis/apis/*/outputs/*/*.json
 include edenai_apis/apis/*/info.json
 include edenai_apis/features/*/data/*
+include edenai_apis/features/audio/*/*.json
+include edenai_apis/features/image/*/*.json
+include edenai_apis/features/multimodal/*/*.json
+include edenai_apis/features/text/*/*.json
+include edenai_apis/features/ocr/*/*.json
+include edenai_apis/features/translation/*/*.json
+include edenai_apis/features/video/*/*.json
 include edenai_apis/features/ocr/identity_parser/countries.json
+include edenai_apis/llmengine/clients/llm_models/models.json
 recursive-include edenai_apis/utils *

edenai_apis/__init__.py

@@ -17,10 +17,11 @@
 To see all available providers and features,
 check the Full documentation at <https://edenai.github.io/edenai_apis>.
 """
+
 from . import apis
 from . import features
 from . import interface
 from . import loaders
 from . import settings
 from . import utils
-from .interface_v2 import Text, Ocr, Video, Audio, Image, Translation, Multimodal
+from .interface_v2 import Text, Ocr, Video, Audio, Image, Translation, Multimodal, Llm

edenai_apis/api_keys/deepseek_settings_template.json

@@ -0,0 +1,3 @@
+{
+    "api_key": ""
+}

edenai_apis/api_keys/groq_settings_template.json

@@ -0,0 +1,3 @@
+{
+    "api_key": ""
+}

edenai_apis/api_keys/microsoft_settings_template.json

@@ -54,5 +54,9 @@
     "training_key": "",
     "prediction_key": "",
     "resource_id": ""
+  },
+  "generative": {
+    "url": "",
+    "key": ""
   }
 }

edenai_apis/api_keys/together_ai_settings_template.json

@@ -0,0 +1,3 @@
+{
+    "api_key": ""
+}

edenai_apis/api_keys/xai_settings_template.json

@@ -0,0 +1,3 @@
+{
+    "api_key": ""
+}

edenai_apis/apis/__init__.py

@@ -8,6 +8,7 @@
 from .astria import AstriaApi
 from .base64 import Base64Api
 from .clarifai import ClarifaiApi
+from .clipdrop import ClipdropApi
 from .cohere import CohereApi
 from .corticalio import CorticalioApi
 from .dataleon import DataleonApi
@@ -23,7 +24,10 @@
 from .gladia import GladiaApi
 from .google import GoogleApi
 from .hireability import HireabilityApi
+from .ibm import IbmApi
+from .jina import JinaApi
 from .klippa import KlippaApi
+from .leonardo import LeonardoApi
 from .lovoai import LovoaiApi
 from .meaningcloud import MeaningcloudApi
 from .meta import MetaApi
@@ -52,16 +56,17 @@
 from .symbl import SymblApi
 from .tabscanner import TabscannerApi
 from .tenstorrent import TenstorrentApi
+from .twelvelabs import TwelveLabsApi
 from .vernai import VernaiApi
 from .veryfi import VeryfiApi
 from .voci import VociApi
 from .voxist import VoxistApi
 from .winstonai import WinstonaiApi
 from .writesonic import WritesonicApi
-from .jina import JinaApi
-from .twelvelabs import TwelveLabsApi
-from .clipdrop import ClipdropApi
-from .leonardo import LeonardoApi
+from .xai import XAiApi
+from .deepseek import DeepseekApi
+from .together_ai import TogetheraiApi
+from .groq import GroqApi
 from .picsart import PicsartApi
 
 # THIS NEEDS TO BE DONE AUTOMATICALLY

edenai_apis/apis/affinda/affinda_api.py

@@ -39,7 +39,7 @@ def __init__(self, api_keys: Dict = {}):
         self.client.current_organization = self.client.get_organizations()[0].identifier
 
     def ocr__resume_parser(
-        self, file: str, file_url: str = "", model: str = None
+        self, file: str, file_url: str = "", model: str = None, **kwargs
     ) -> ResponseType[ResumeParserDataClass]:
         self.client.current_workspace = self.api_settings["nextgen_resume_parser"]
 
@@ -63,7 +63,7 @@ def ocr__resume_parser(
         )
 
     def ocr__invoice_parser(
-        self, file: str, language: str, file_url: str = ""
+        self, file: str, language: str, file_url: str = "", **kwargs
     ) -> ResponseType[InvoiceParserDataClass]:
         self.client.current_workspace = self.api_settings["invoice_workspace"]
 
@@ -87,7 +87,7 @@ def ocr__invoice_parser(
         )
 
     def ocr__receipt_parser(
-        self, file: str, language: str, file_url: str = ""
+        self, file: str, language: str, file_url: str = "", **kwargs
     ) -> ResponseType[ReceiptParserDataClass]:
         self.client.current_workspace = self.api_settings["receipt_workspace"]
         document = self.client.create_document(
@@ -110,7 +110,7 @@ def ocr__receipt_parser(
         )
 
     def ocr__identity_parser(
-        self, file: str, file_url: str = "", model: str = None
+        self, file: str, file_url: str = "", model: str = None, **kwargs
     ) -> ResponseType[IdentityParserDataClass]:
         self.client.current_workspace = self.api_settings["identity_workspace"]
         document = self.client.create_document(
@@ -135,6 +135,7 @@ def ocr__financial_parser(
         document_type: str = "",
         file_url: str = "",
         model: str = None,
+        **kwargs,
     ) -> ResponseType[FinancialParserDataClass]:
         workspace_key = (
             "receipt_workspace"