Merge pull request #591 from jamie-beck/jamie-beck-patch-1

fix model_tokens not being used for ollama

Author: VinciGit00

CHANGELOG.md

@@ -1,8 +1,10 @@
-## [1.15.0-beta.3](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.15.0-beta.2...v1.15.0-beta.3) (2024-08-24)
+## [1.14.1](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.14.0...v1.14.1) (2024-08-24)
+
 
 
 ### Bug Fixes
 
+
 * update abstract graph ([86fe5fc](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/86fe5fcaf1a6ba28786678874378f07fba1db40f))
 
 ## [1.15.0-beta.2](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.15.0-beta.1...v1.15.0-beta.2) (2024-08-23)
@@ -17,25 +19,8 @@
 
 * added sponsors ([b3a2d0d](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/b3a2d0d65a41f6e645fac3fc84f702fdf64b951c))
 
-## [1.15.0-beta.1](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.14.1-beta.1...v1.15.0-beta.1) (2024-08-23)
-
-
-### Features
-
-* ligthweigthing the library ([62f32e9](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/62f32e994bcb748dfef4f7e1b2e5213a989c33cc))
-
-
-### Bug Fixes
-
-* Azure OpenAI issue ([a92b9c6](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/a92b9c6970049a4ba9dbdf8eff3eeb7f98c6c639))
-
-## [1.14.1-beta.1](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.14.0...v1.14.1-beta.1) (2024-08-21)
-
-
-### Bug Fixes
-
-* **models_tokens:** add llama2 and llama3 sizes explicitly ([b05ec16](https://github.com/ScrapeGraphAI/Scrapegraph-ai/commit/b05ec16b252d00c9c9ee7c6d4605b420851c7754))
 
+#
 ## [1.14.0](https://github.com/ScrapeGraphAI/Scrapegraph-ai/compare/v1.13.3...v1.14.0) (2024-08-20)
 
 

pyproject.toml

@@ -1,6 +1,9 @@
 [project]
 name = "scrapegraphai"
-version = "1.15.0b3"
+
+
+version = "1.14.1"
+
 description = "A web scraping library based on LangChain which uses LLM and direct graph logic to create scraping pipelines."
 authors = [
     { name = "Marco Vinciguerra", email = "[email protected]" },

scrapegraphai/graphs/abstract_graph.py

@@ -169,8 +169,9 @@ def handle_model(model_name, provider, token_key, default_token=8192):
 
             elif "ollama" in llm_params["model"]:
                 model_name = llm_params["model"].split("ollama/")[-1]
-                token_key = model_name if "model_tokens" not in llm_params else llm_params["model_tokens"]
-                return handle_model(model_name, "ollama", token_key)
+                token_key = model_name if "model_tokens" not in llm_params else None
+                explicit_model_tokens = 8192 if "model_tokens" not in llm_params else llm_params["model_tokens"]
+                return handle_model(model_name, "ollama", token_key, explicit_model_tokens)
 
             elif "claude-3-" in llm_params["model"]:
                 return handle_model(llm_params["model"], "anthropic", "claude3")
@@ -268,4 +269,4 @@ def _create_graph(self):
     def run(self) -> str:
         """
         Abstract method to execute the graph and return the result.
-        """
+        """

scrapegraphai/helpers/models_tokens.py

@@ -138,6 +138,7 @@
         "claude-3-5-sonnet-20240620": 200000,
     },
     "bedrock": {
+        "anthropic.claude-3-5-sonnet-20240620": 200000,
         "anthropic.claude-3-haiku-20240307-v1:0": 200000,
         "anthropic.claude-3-sonnet-20240229-v1:0": 200000,
         "anthropic.claude-3-opus-20240229-v1:0": 200000,