LLMFunctionObjects 0.2.0__tar.gz → 0.2.2__tar.gz

{llmfunctionobjects-0.2.0 → llmfunctionobjects-0.2.2}/LLMFunctionObjects/Configuration.py

@@ -7,6 +7,7 @@ class Configuration:
     def __init__(self,
                  name: str,
                  api_key: Union[str, None] = None,
+                 base_url: Union[str, None] = None,
                  api_user_id: Union[str, None] = None,
                  module: str = '',
                  model: str = '',
@@ -41,6 +42,7 @@ class Configuration:
         #    stop_tokens = ['.', '?', '!']
         self.name = name
         self.api_key = api_key
+        self.base_url = base_url
         self.api_user_id = api_user_id
         self.module = module
         self.model = model
@@ -111,6 +113,7 @@ class Configuration:
         newObj = type(self)(
             name=self.name,
             api_key=self.api_key,
+            base_url=self.base_url,
             api_user_id=self.api_user_id,
             module=self.module,
             model=self.model,
@@ -161,6 +164,7 @@ class Configuration:
         return {
             'name': self.name,
             'api_key': self.api_key,
+            'base_url': self.base_url,
             'api_user_id': self.api_user_id,
             'module': self.module,
             'model': self.model,

{llmfunctionobjects-0.2.0 → llmfunctionobjects-0.2.2}/LLMFunctionObjects/EvaluatorChatGemini.py

@@ -1,7 +1,8 @@
-import google.generativeai as genai
-
 from LLMFunctionObjects.EvaluatorChat import EvaluatorChat
-from LLMFunctionObjects.EvaluatorGemini import _extract_gemini_text
+from LLMFunctionObjects.EvaluatorGemini import (
+    _generate_with_google_genai,
+    _generate_with_google_generativeai,
+)
 
 
 class EvaluatorChatGemini(EvaluatorChat):
@@ -55,37 +56,30 @@ class EvaluatorChatGemini(EvaluatorChat):
         model_name = args2.get("model", self.conf.model)
         tools = args2.get("tools", None)
         tool_config = args2.get("tool_config", None)
-        model_init_args = {}
-        if system_instruction:
-            model_init_args["system_instruction"] = system_instruction
-        if tools is not None:
-            model_init_args["tools"] = tools
-        if tool_config is not None:
-            model_init_args["tool_config"] = tool_config
 
-        try:
-            model = genai.GenerativeModel(model_name, **model_init_args)
-        except TypeError:
-            # Fallback for older google-generativeai versions
-            model = genai.GenerativeModel(model_name)
+        self.llm_result = None
+        res, text = _generate_with_google_genai(
+            model_name=model_name,
+            contents=res_messages,
+            args2=args2,
+            system_instruction=system_instruction,
+            tools=tools,
+            tool_config=tool_config,
+        )
+        if res is None:
             if system_instruction:
                 res_messages.insert(0, {"role": "user", "parts": [system_instruction]})
-
-        model_args = {
-            "generation_config": args2.get("generation_config", None),
-            "safety_settings": args2.get("safety_settings", None),
-            "tools": None,
-            "tool_config": None,
-            "stream": args2.get("stream", None),
-            "request_options": args2.get("request_options", None),
-        }
-        model_args = {k: v for k, v in model_args.items() if v is not None}
-
-        self.llm_result = None
-        res = model.generate_content(res_messages, **model_args)
+            res, text = _generate_with_google_generativeai(
+                model_name=model_name,
+                contents=res_messages,
+                args2=args2,
+                system_instruction=None,
+                tools=tools,
+                tool_config=tool_config,
+            )
         self.llm_result = res
 
         if echo:
             print(f"LLM result: {res}")
 
-        return self.post_process(_extract_gemini_text(res), form=args.get("form", None))
+        return self.post_process(text, form=args.get("form", None))

llmfunctionobjects-0.2.2/LLMFunctionObjects/EvaluatorGemini.py

@@ -0,0 +1,189 @@
+import importlib
+import os
+import warnings
+
+from LLMFunctionObjects.Evaluator import Evaluator
+
+
+def _extract_gemini_text(res):
+    if hasattr(res, "text") and res.text is not None:
+        return res.text
+    if isinstance(res, dict):
+        if "text" in res and res["text"] is not None:
+            return res["text"]
+    if hasattr(res, "candidates") and res.candidates:
+        cand = res.candidates[0]
+        if hasattr(cand, "content") and hasattr(cand.content, "parts"):
+            parts = cand.content.parts
+            if parts:
+                if isinstance(parts[0], str):
+                    return "".join(parts)
+                if hasattr(parts[0], "text"):
+                    return "".join([p.text for p in parts if hasattr(p, "text")])
+    return res
+
+
+def _import_google_genai():
+    try:
+        return importlib.import_module("google.genai")
+    except ImportError:
+        return None
+
+
+def _import_google_generativeai():
+    try:
+        return importlib.import_module("google.generativeai")
+    except ImportError:
+        return None
+
+
+def _gemini_config_from_args(args2, system_instruction=None, tools=None, tool_config=None):
+    config = {}
+    generation_config = args2.get("generation_config", None)
+    if isinstance(generation_config, dict):
+        config.update(generation_config)
+
+    if args2.get("temperature", None) is not None:
+        config["temperature"] = args2.get("temperature")
+    if args2.get("max_tokens", None) is not None and "max_output_tokens" not in config:
+        config["max_output_tokens"] = args2.get("max_tokens")
+    if args2.get("stop_tokens", None) and "stop_sequences" not in config:
+        config["stop_sequences"] = args2.get("stop_tokens")
+    if args2.get("safety_settings", None) is not None:
+        config["safety_settings"] = args2.get("safety_settings")
+    if system_instruction:
+        config["system_instruction"] = system_instruction
+    if tools is not None:
+        config["tools"] = tools
+    if tool_config is not None:
+        config["tool_config"] = tool_config
+
+    return config if len(config) > 0 else None
+
+
+def _resolve_gemini_key(args2):
+    return args2.get("api_key", None) or os.environ.get("GEMINI_API_KEY", os.environ.get("GOOGLE_API_KEY"))
+
+
+def _generate_with_google_genai(model_name, contents, args2, system_instruction=None, tools=None, tool_config=None):
+    google_genai = _import_google_genai()
+    if google_genai is None:
+        return None, None
+
+    api_key = _resolve_gemini_key(args2)
+    client = google_genai.Client(api_key=api_key)
+    config = _gemini_config_from_args(args2, system_instruction=system_instruction, tools=tools, tool_config=tool_config)
+
+    if args2.get("stream", False):
+        chunks = client.models.generate_content_stream(model=model_name, contents=contents, config=config)
+        text_chunks = []
+        last_chunk = None
+        for chunk in chunks:
+            last_chunk = chunk
+            chunk_text = _extract_gemini_text(chunk)
+            if isinstance(chunk_text, str):
+                text_chunks.append(chunk_text)
+        return last_chunk, "".join(text_chunks)
+
+    res = client.models.generate_content(model=model_name, contents=contents, config=config)
+    return res, _extract_gemini_text(res)
+
+
+def _generate_with_google_generativeai(model_name, contents, args2, system_instruction=None, tools=None, tool_config=None):
+    genai = _import_google_generativeai()
+    if genai is None:
+        raise ImportError(
+            "Neither 'google.genai' nor 'google.generativeai' is available. "
+            "Install 'google-genai' to use Gemini."
+        )
+
+    warnings.warn(
+        "Using deprecated 'google.generativeai'. Install 'google-genai' to use the supported Gemini SDK.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+
+    api_key = _resolve_gemini_key(args2)
+    if api_key is not None:
+        genai.configure(api_key=api_key)
+
+    model_init_args = {}
+    if system_instruction:
+        model_init_args["system_instruction"] = system_instruction
+    if tools is not None:
+        model_init_args["tools"] = tools
+    if tool_config is not None:
+        model_init_args["tool_config"] = tool_config
+
+    try:
+        model = genai.GenerativeModel(model_name, **model_init_args)
+    except TypeError:
+        model = genai.GenerativeModel(model_name)
+        if system_instruction and isinstance(contents, str):
+            contents = f"{system_instruction}\n\n{contents}"
+
+    model_args = {
+        "generation_config": args2.get("generation_config", None),
+        "safety_settings": args2.get("safety_settings", None),
+        "tools": None,
+        "tool_config": None,
+        "stream": args2.get("stream", None),
+        "request_options": args2.get("request_options", None),
+    }
+    model_args = {k: v for k, v in model_args.items() if v is not None}
+    res = model.generate_content(contents, **model_args)
+    return res, _extract_gemini_text(res)
+
+
+class EvaluatorGemini(Evaluator):
+    def eval(self, texts, **args):
+        confDict = self.conf.to_dict()
+
+        echo = args.get("echo", False)
+        if echo:
+            print(f"Configuration: {self.conf}")
+
+        args2 = {**self.conf.to_dict(), **args}
+
+        # Handle argument renames
+        for k, v in confDict["argument_renames"].items():
+            args2[v] = args2.get(v, args2.get(k, None))
+
+        # Build prompt
+        fullPrompt = confDict["prompt_delimiter"].join(confDict["prompts"])
+        prompt = self.prompt_texts_combiner(fullPrompt, texts)
+
+        if echo:
+            print(f"Prompt: {prompt}")
+
+        # Configure model
+        model_name = args2.get("model", self.conf.model)
+        system_instruction = args2.get("system_instruction", None)
+        tools = args2.get("tools", None)
+        tool_config = args2.get("tool_config", None)
+
+        # Invoke Gemini
+        self.llm_result = None
+        res, text = _generate_with_google_genai(
+            model_name=model_name,
+            contents=prompt,
+            args2=args2,
+            system_instruction=system_instruction,
+            tools=tools,
+            tool_config=tool_config,
+        )
+        if res is None:
+            res, text = _generate_with_google_generativeai(
+                model_name=model_name,
+                contents=prompt,
+                args2=args2,
+                system_instruction=system_instruction,
+                tools=tools,
+                tool_config=tool_config,
+            )
+        self.llm_result = res
+
+        if echo:
+            print(f"LLM result: {res}")
+
+        return self.post_process(text, form=args.get("form", None))

{llmfunctionobjects-0.2.0 → llmfunctionobjects-0.2.2}/LLMFunctionObjects/LLMFunctions.py

@@ -12,7 +12,6 @@ from LLMFunctionObjects.EvaluatorOllama import EvaluatorOllama
 from LLMFunctionObjects.Functor import Functor
 from LLMFunctionObjects.Chat import Chat
 import openai
-import google.generativeai as genai
 
 
 # ===========================================================
@@ -29,12 +28,13 @@ def llm_configuration(spec, **kwargs):
         confOpenAI = Configuration(
             name="openai",
             api_key=None,
+            base_url=None,
             api_user_id='user',
             module='openai',
             model='gpt-3.5-turbo-instruct',  # was 'text-davinci-003'
             function=openai.completions.create,  # was openai.Completion.create
             temperature=0.2,
-            max_tokens=300,
+            max_tokens=512,
             total_probability_cutoff=0.03,
             prompts=None,
             prompt_delimiter=' ',
@@ -54,7 +54,11 @@ def llm_configuration(spec, **kwargs):
         # Client and key
         apiKey = os.environ.get("OPENAI_API_KEY")
         apiKey = kwargs.get("api_key", apiKey)
-        client = openai.OpenAI(api_key=apiKey)
+        baseUrl = kwargs.get("base_url", os.environ.get("OPENAI_BASE_URL", "https://api.openai.com/v1"))
+        client_kwargs = {"api_key": apiKey}
+        if baseUrl is not None:
+            client_kwargs["base_url"] = baseUrl
+        client = openai.OpenAI(**client_kwargs)
 
         default_chat_model = os.environ.get("OPENAI_CHAT_MODEL", os.environ.get("OPENAI_MODEL", "gpt-4.1-mini"))
 
@@ -63,6 +67,7 @@ def llm_configuration(spec, **kwargs):
                                         module='openai',
                                         model=default_chat_model,
                                         function=client.chat.completions.create,  # was openai.ChatCompletion.create,
+                                        max_tokens=8192,
                                         argument_renames={"max_tokens": "max_completion_tokens"},
                                         known_params=["model", "messages", "functions", "function_call",
                                                       "tools", "tool_choice", "response_format",
@@ -74,6 +79,8 @@ def llm_configuration(spec, **kwargs):
                                                       "user"],
                                         response_value_keys=[])
 
+        # Apparently, base_url cannot be included in known_params -- it is for the client object only.
+
         if len(kwargs) > 0:
             confChatGPT = confChatGPT.combine(kwargs)
 
@@ -83,22 +90,21 @@ def llm_configuration(spec, **kwargs):
         return confChatGPT
     elif isinstance(spec, str) and spec.lower() == 'Gemini'.lower():
 
-        # Set key
+        # Resolve key eagerly but configure clients lazily in evaluators.
         apiKey = os.environ.get("GEMINI_API_KEY", os.environ.get("GOOGLE_API_KEY"))
         apiKey = kwargs.get("api_key", apiKey)
-        genai.configure(api_key=apiKey)
 
         default_gemini_model = os.environ.get("GEMINI_MODEL", "gemini-2.5-flash")
 
         confGemini = Configuration(
             name="gemini",
-            api_key=None,
+            api_key=apiKey,
             api_user_id="user",
-            module="google.generativeai",
+            module="google.genai",
             model=default_gemini_model,
             function=None,
             temperature=0.2,
-            max_tokens=300,
+            max_tokens=8192,
             total_probability_cutoff=0.03,
             prompts=None,
             prompt_delimiter=" ",
@@ -146,7 +152,7 @@ def llm_configuration(spec, **kwargs):
             model=default_ollama_model,
             function=None,
             temperature=0.2,
-            max_tokens=300,
+            max_tokens=8192,
             total_probability_cutoff=0.03,
             prompts=None,
             prompt_delimiter=" ",

{llmfunctionobjects-0.2.0 → llmfunctionobjects-0.2.2}/LLMFunctionObjects.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LLMFunctionObjects
-Version: 0.2.0
+Version: 0.2.2
 Summary: Large Language Models (LLMs) functions package.
 Home-page: https://github.com/antononcube/Python-packages/tree/main/LLMFunctionObjects
 Author: Anton Antonov
@@ -16,7 +16,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: google-generativeai>=0.3.2
+Requires-Dist: google-genai>=1.0.0
 Requires-Dist: openai>=1.3.0
 Requires-Dist: ollama>=0.1.7
 Dynamic: author
@@ -67,7 +67,7 @@ pip install LLMFunctionObjects
 
 ## Design
 
-"Out of the box" ["LLMFunctionObjects"](https://pypi.org/project/LLMFunctionObjects) uses ["openai"](https://pypi.org/project/openai/), [OAIp1], and ["google-generativeai"](https://pypi.org/project/google-generativeai/), [GAIp1], and ["ollama"](https://pypi.org/project/ollama/).
+"Out of the box" ["LLMFunctionObjects"](https://pypi.org/project/LLMFunctionObjects) uses ["openai"](https://pypi.org/project/openai/), [OAIp1], and ["google-genai"](https://pypi.org/project/google-genai/), [GAIp1], and ["ollama"](https://pypi.org/project/ollama/).
 
 Other LLM access packages can be utilized via appropriate LLM configurations.
 
@@ -161,6 +161,8 @@ for k, v in llm_configuration('ChatGPT').to_dict().items():
 **Remark:** Both the "OpenAI" and "ChatGPT" configuration use functions of the package "openai", [OAIp1].
 The "OpenAI" configuration is for text-completions;
 the "ChatGPT" configuration is for chat-completions. 
+To use an OpenAI-compatible local server, pass `base_url` (or set `OPENAI_BASE_URL`), e.g.
+`llm_configuration("ChatGPT", base_url="http://127.0.0.1:8080/v1")`.
 
 ### Gemini-based
 
@@ -562,7 +564,7 @@ Generally, speaking prefer using the "Chat" prefixed methods: "ChatGPT" and "Cha
 [PyPI.org/antononcube](https://pypi.org/user/antononcube/).
 
 [GAIp1] Google AI,
-[google-generativeai (Google Generative AI Python Client)](https://pypi.org/project/google-generativeai/),
+[google-genai (Google Gen AI Python SDK)](https://pypi.org/project/google-genai/),
 (2023),
 [PyPI.org/google-ai](https://pypi.org/user/google-ai/).
 

{llmfunctionobjects-0.2.0 → llmfunctionobjects-0.2.2}/LLMFunctionObjects.egg-info/requires.txt

@@ -1,3 +1,3 @@
-google-generativeai>=0.3.2
+google-genai>=1.0.0
 openai>=1.3.0
 ollama>=0.1.7

{llmfunctionobjects-0.2.0 → llmfunctionobjects-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LLMFunctionObjects
-Version: 0.2.0
+Version: 0.2.2
 Summary: Large Language Models (LLMs) functions package.
 Home-page: https://github.com/antononcube/Python-packages/tree/main/LLMFunctionObjects
 Author: Anton Antonov
@@ -16,7 +16,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: google-generativeai>=0.3.2
+Requires-Dist: google-genai>=1.0.0
 Requires-Dist: openai>=1.3.0
 Requires-Dist: ollama>=0.1.7
 Dynamic: author
@@ -67,7 +67,7 @@ pip install LLMFunctionObjects
 
 ## Design
 
-"Out of the box" ["LLMFunctionObjects"](https://pypi.org/project/LLMFunctionObjects) uses ["openai"](https://pypi.org/project/openai/), [OAIp1], and ["google-generativeai"](https://pypi.org/project/google-generativeai/), [GAIp1], and ["ollama"](https://pypi.org/project/ollama/).
+"Out of the box" ["LLMFunctionObjects"](https://pypi.org/project/LLMFunctionObjects) uses ["openai"](https://pypi.org/project/openai/), [OAIp1], and ["google-genai"](https://pypi.org/project/google-genai/), [GAIp1], and ["ollama"](https://pypi.org/project/ollama/).
 
 Other LLM access packages can be utilized via appropriate LLM configurations.
 
@@ -161,6 +161,8 @@ for k, v in llm_configuration('ChatGPT').to_dict().items():
 **Remark:** Both the "OpenAI" and "ChatGPT" configuration use functions of the package "openai", [OAIp1].
 The "OpenAI" configuration is for text-completions;
 the "ChatGPT" configuration is for chat-completions. 
+To use an OpenAI-compatible local server, pass `base_url` (or set `OPENAI_BASE_URL`), e.g.
+`llm_configuration("ChatGPT", base_url="http://127.0.0.1:8080/v1")`.
 
 ### Gemini-based
 
@@ -562,7 +564,7 @@ Generally, speaking prefer using the "Chat" prefixed methods: "ChatGPT" and "Cha
 [PyPI.org/antononcube](https://pypi.org/user/antononcube/).
 
 [GAIp1] Google AI,
-[google-generativeai (Google Generative AI Python Client)](https://pypi.org/project/google-generativeai/),
+[google-genai (Google Gen AI Python SDK)](https://pypi.org/project/google-genai/),
 (2023),
 [PyPI.org/google-ai](https://pypi.org/user/google-ai/).
 

{llmfunctionobjects-0.2.0 → llmfunctionobjects-0.2.2}/README.md

@@ -34,7 +34,7 @@ pip install LLMFunctionObjects
 
 ## Design
 
-"Out of the box" ["LLMFunctionObjects"](https://pypi.org/project/LLMFunctionObjects) uses ["openai"](https://pypi.org/project/openai/), [OAIp1], and ["google-generativeai"](https://pypi.org/project/google-generativeai/), [GAIp1], and ["ollama"](https://pypi.org/project/ollama/).
+"Out of the box" ["LLMFunctionObjects"](https://pypi.org/project/LLMFunctionObjects) uses ["openai"](https://pypi.org/project/openai/), [OAIp1], and ["google-genai"](https://pypi.org/project/google-genai/), [GAIp1], and ["ollama"](https://pypi.org/project/ollama/).
 
 Other LLM access packages can be utilized via appropriate LLM configurations.
 
@@ -128,6 +128,8 @@ for k, v in llm_configuration('ChatGPT').to_dict().items():
 **Remark:** Both the "OpenAI" and "ChatGPT" configuration use functions of the package "openai", [OAIp1].
 The "OpenAI" configuration is for text-completions;
 the "ChatGPT" configuration is for chat-completions. 
+To use an OpenAI-compatible local server, pass `base_url` (or set `OPENAI_BASE_URL`), e.g.
+`llm_configuration("ChatGPT", base_url="http://127.0.0.1:8080/v1")`.
 
 ### Gemini-based
 
@@ -529,7 +531,7 @@ Generally, speaking prefer using the "Chat" prefixed methods: "ChatGPT" and "Cha
 [PyPI.org/antononcube](https://pypi.org/user/antononcube/).
 
 [GAIp1] Google AI,
-[google-generativeai (Google Generative AI Python Client)](https://pypi.org/project/google-generativeai/),
+[google-genai (Google Gen AI Python SDK)](https://pypi.org/project/google-genai/),
 (2023),
 [PyPI.org/google-ai](https://pypi.org/user/google-ai/).
 
@@ -541,4 +543,4 @@ Generally, speaking prefer using the "Chat" prefixed methods: "ChatGPT" and "Cha
 [WRIp1] Wolfram Research, Inc.
 [LLMFunctions paclet](https://resources.wolframcloud.com/PacletRepository/resources/Wolfram/LLMFunctionObjects/),
 (2023),
-[Wolfram Language Paclet Repository](https://resources.wolframcloud.com/PacletRepository/).
+[Wolfram Language Paclet Repository](https://resources.wolframcloud.com/PacletRepository/).

{llmfunctionobjects-0.2.0 → llmfunctionobjects-0.2.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="LLMFunctionObjects",
-    version="0.2.0",
+    version="0.2.2",
     author="Anton Antonov",
     author_email="antononcube@posteo.net",
     description="Large Language Models (LLMs) functions package.",
@@ -13,7 +13,7 @@ setuptools.setup(
     long_description_content_type="text/markdown",
     url="https://github.com/antononcube/Python-packages/tree/main/LLMFunctionObjects",
     packages=setuptools.find_packages(),
-    install_requires=["google-generativeai>=0.3.2", "openai>=1.3.0", "ollama>=0.1.7"],
+    install_requires=["google-genai>=1.0.0", "openai>=1.3.0", "ollama>=0.1.7"],
     classifiers=[
         "Intended Audience :: Science/Research",
         "Intended Audience :: Developers",

llmfunctionobjects-0.2.0/LLMFunctionObjects/EvaluatorGemini.py

@@ -1,84 +0,0 @@
-import google.generativeai as genai
-
-from LLMFunctionObjects.Evaluator import Evaluator
-
-
-def _extract_gemini_text(res):
-    if hasattr(res, "text") and res.text is not None:
-        return res.text
-    if isinstance(res, dict):
-        if "text" in res and res["text"] is not None:
-            return res["text"]
-    if hasattr(res, "candidates") and res.candidates:
-        cand = res.candidates[0]
-        if hasattr(cand, "content") and hasattr(cand.content, "parts"):
-            parts = cand.content.parts
-            if parts:
-                if isinstance(parts[0], str):
-                    return "".join(parts)
-                if hasattr(parts[0], "text"):
-                    return "".join([p.text for p in parts if hasattr(p, "text")])
-    return res
-
-
-class EvaluatorGemini(Evaluator):
-    def eval(self, texts, **args):
-        confDict = self.conf.to_dict()
-
-        echo = args.get("echo", False)
-        if echo:
-            print(f"Configuration: {self.conf}")
-
-        args2 = {**self.conf.to_dict(), **args}
-
-        # Handle argument renames
-        for k, v in confDict["argument_renames"].items():
-            args2[v] = args2.get(v, args2.get(k, None))
-
-        # Build prompt
-        fullPrompt = confDict["prompt_delimiter"].join(confDict["prompts"])
-        prompt = self.prompt_texts_combiner(fullPrompt, texts)
-
-        if echo:
-            print(f"Prompt: {prompt}")
-
-        # Configure model
-        model_name = args2.get("model", self.conf.model)
-        system_instruction = args2.get("system_instruction", None)
-        tools = args2.get("tools", None)
-        tool_config = args2.get("tool_config", None)
-        model_init_args = {}
-        if system_instruction:
-            model_init_args["system_instruction"] = system_instruction
-        if tools is not None:
-            model_init_args["tools"] = tools
-        if tool_config is not None:
-            model_init_args["tool_config"] = tool_config
-
-        try:
-            model = genai.GenerativeModel(model_name, **model_init_args)
-        except TypeError:
-            # Fallback for older google-generativeai versions
-            model = genai.GenerativeModel(model_name)
-            if system_instruction:
-                prompt = f"{system_instruction}\n\n{prompt}"
-
-        model_args = {
-            "generation_config": args2.get("generation_config", None),
-            "safety_settings": args2.get("safety_settings", None),
-            "tools": None,
-            "tool_config": None,
-            "stream": args2.get("stream", None),
-            "request_options": args2.get("request_options", None),
-        }
-        model_args = {k: v for k, v in model_args.items() if v is not None}
-
-        # Invoke Gemini
-        self.llm_result = None
-        res = model.generate_content(prompt, **model_args)
-        self.llm_result = res
-
-        if echo:
-            print(f"LLM result: {res}")
-
-        return self.post_process(_extract_gemini_text(res), form=args.get("form", None))