GameSentenceMiner 2.18.1__tar.gz → 2.21.25__tar.gz

gamesentenceminer-2.21.25/GameSentenceMiner/__init__.py

@@ -0,0 +1,39 @@
+import os
+
+# Remove environment variables that could interfere with managed Python instance
+# This prevents conflicts with user's system Python installations and configurations
+
+# Tk/Tcl libraries
+os.environ.pop('TCL_LIBRARY', None)
+os.environ.pop('TK_LIBRARY', None)
+
+# Python-specific paths that could cause module conflicts
+os.environ.pop('PYTHONPATH', None)
+os.environ.pop('PYTHONHOME', None)
+os.environ.pop('PYTHONSTARTUP', None)
+os.environ.pop('PYTHONUSERBASE', None)
+
+# Virtual environment variables
+os.environ.pop('VIRTUAL_ENV', None)
+os.environ.pop('CONDA_PREFIX', None)
+os.environ.pop('CONDA_DEFAULT_ENV', None)
+os.environ.pop('CONDA_PYTHON_EXE', None)
+
+# Python version managers
+os.environ.pop('PYENV_ROOT', None)
+os.environ.pop('PYENV_VERSION', None)
+os.environ.pop('PYENV_SHELL', None)
+
+# Poetry package manager
+os.environ.pop('POETRY_ACTIVE', None)
+os.environ.pop('POETRY_HOME', None)
+
+# Pip configuration that could override behavior
+os.environ.pop('PIP_CONFIG_FILE', None)
+os.environ.pop('PIP_REQUIRE_VIRTUALENV', None)
+
+# Prevent user site-packages from being loaded
+# os.environ['PYTHONNOUSERSITE'] = '1'
+
+# Isolate from system installations
+os.environ['PYTHONIOENCODING'] = 'utf-8'

{gamesentenceminer-2.18.1 → gamesentenceminer-2.21.25}/GameSentenceMiner/ai/ai_prompting.py

@@ -213,13 +213,17 @@ class OpenAIManager(AIManager):
                 text_output = response.choices[0].message.content.strip()
                 # get the json at the end of the message
                 if "{" in text_output and "}" in text_output:
-                    json_output = text_output[text_output.find(
-                        "{"):text_output.rfind("}")+1]
-                    text_output = json.loads(json_output)['output']
+                    try:
+                        json_output = text_output[text_output.find(
+                            "{"):text_output.rfind("}")+1]
+                        json_output = json_output.replace("{output:", '{"output":')
+                        text_output = json.loads(json_output)['output']
+                    except Exception as e:
+                        self.logger.debug(f"Failed to parse JSON from response returning response raw: {e}", exc_info=True)
             # self.logger.debug(f"Received response:\n{text_output}")
             return text_output
         except Exception as e:
-            self.logger.error(f"OpenAI processing failed: {e}")
+            self.logger.error(f"OpenAI processing failed: {e}", exc_info=True)
             return f"Processing failed: {e}"
 
 
@@ -361,37 +365,34 @@ def get_ai_prompt_result(lines: List[GameLine], sentence: str, current_line: Gam
                 "No internet connection. Unable to proceed with AI prompt.")
             return ""
 
-        if not ai_manager or ai_config_changed(get_config().ai, current_ai_config) or force_refresh:
-            provider = get_config().ai.provider
-            if provider == AIType.GEMINI.value:
-                if get_config().ai.gemini_model in ai_managers:
-                    ai_manager = ai_managers[get_config().ai.gemini_model]
-                    logger.info(
-                        f"Reusing existing Gemini AI Manager for model: {get_config().ai.gemini_model}")
-                else:
-                    ai_manager = GeminiAI(model=get_config(
-                    ).ai.gemini_model, api_key=get_config().ai.gemini_api_key, logger=logger)
-            elif provider == AIType.GROQ.value:
-                if get_config().ai.groq_model in ai_managers:
-                    ai_manager = ai_managers[get_config().ai.groq_model]
-                    logger.info(
-                        f"Reusing existing Groq AI Manager for model: {get_config().ai.groq_model}")
-                else:
-                    ai_manager = GroqAI(model=get_config(
-                    ).ai.groq_model, api_key=get_config().ai.groq_api_key, logger=logger)
-            elif provider == AIType.OPENAI.value:
-                if f"{get_config().ai.open_ai_url}:{get_config().ai.open_ai_model}:{get_config().ai.open_ai_api_key}" in ai_managers:
-                    ai_manager = ai_managers[f"{get_config().ai.open_ai_url}:{get_config().ai.open_ai_model}:{get_config().ai.open_ai_api_key}"]
-                    logger.info(
-                        f"Reusing existing OpenAI AI Manager for model: {get_config().ai.open_ai_model}")
-                else:
-                    ai_manager = OpenAIManager(model=get_config().ai.open_ai_model, api_key=get_config(
-                    ).ai.open_ai_api_key, api_url=get_config().ai.open_ai_url, logger=logger)
+        provider = get_config().ai.provider
+        if provider == AIType.GEMINI.value:
+            if get_config().ai.gemini_model in ai_managers:
+                ai_manager = ai_managers[get_config().ai.gemini_model]
+                logger.info(
+                    f"Reusing existing Gemini AI Manager for model: {get_config().ai.gemini_model}")
             else:
-                ai_manager = None
-            if ai_manager:
-                ai_managers[ai_manager.model_name] = ai_manager
-            current_ai_config = get_config().ai
+                ai_manager = GeminiAI(model=get_config(
+                ).ai.gemini_model, api_key=get_config().ai.gemini_api_key, logger=logger)
+        elif provider == AIType.GROQ.value:
+            if get_config().ai.groq_model in ai_managers:
+                ai_manager = ai_managers[get_config().ai.groq_model]
+                logger.info(
+                    f"Reusing existing Groq AI Manager for model: {get_config().ai.groq_model}")
+            else:
+                ai_manager = GroqAI(model=get_config(
+                ).ai.groq_model, api_key=get_config().ai.groq_api_key, logger=logger)
+        elif provider == AIType.OPENAI.value:
+            if f"{get_config().ai.open_ai_url}:{get_config().ai.open_ai_model}:{get_config().ai.open_ai_api_key}" in ai_managers:
+                ai_manager = ai_managers[f"{get_config().ai.open_ai_url}:{get_config().ai.open_ai_model}:{get_config().ai.open_ai_api_key}"]
+                logger.info(
+                    f"Reusing existing OpenAI AI Manager for model: {get_config().ai.open_ai_model}")
+            else:
+                ai_manager = OpenAIManager(model=get_config().ai.open_ai_model, api_key=get_config(
+                ).ai.open_ai_api_key, api_url=get_config().ai.open_ai_url, logger=logger)
+        if ai_manager:
+            ai_managers[ai_manager.model_name] = ai_manager
+        current_ai_config = get_config().ai
 
         if not ai_manager:
             logger.error(