Clean up interprompt refactoring

* Fix module name prompt_template -> multilang_prompt
  * Move prompt factory-related code to separate module prompt_factory
  * Restore correct class name: PromptCollection -> MultiLangPromptCollection

src/interprompt/__init__.py

@@ -1,3 +1,3 @@
-from .promt_template import autogenerate_prompt_factory_module
+from .prompt_factory import autogenerate_prompt_factory_module
 
 __all__ = ["autogenerate_prompt_factory_module"]

src/interprompt/multilang_prompt.py

@@ -16,8 +16,8 @@ class PromptTemplate(ToStringMixin, ParameterizedTemplateInterface):
         self.name = name
         self._jinja_template = JinjaTemplate(jinja_template_string.strip())
 
-    def _tostring_excludes(self) -> list[str]:
-        return ["jinja_template"]
+    def _tostring_exclude_private(self) -> bool:
+        return True
 
     def render(self, **kwargs: Any) -> str:
         return self._jinja_template.render(**kwargs)
@@ -192,7 +192,7 @@ class MultiLangPromptList(_MultiLangContainer[PromptList]):
     pass
 
 
-class PromptCollection:
+class MultiLangPromptCollection:
     """
     Main class for managing a collection of prompt templates and prompt lists, with support for multiple languages.
     All data will be read from the yamls directly contained in the given directory on initialization.
@@ -318,74 +318,3 @@ class PromptCollection:
     ) -> str:
         """Renders the prompt template for the given prompt name and language code."""
         return self.get_prompt_template(prompt_name, lang_code=lang_code).render(**kwargs)
-
-
-class PromptFactoryBase:
-    """A base class for auto-generated prompt factory classes."""
-
-    def __init__(self, prompts_dir: str, lang_code: str = DEFAULT_LANG_CODE, fallback_mode=LanguageFallbackMode.EXCEPTION):
-        """
-        :param prompts_dir: the directory containing the prompt templates and prompt lists
-        :param lang_code: the language code to use for retrieving the prompt templates and prompt lists.
-            Leave as `default` for single-language use cases.
-        :param fallback_mode: the fallback mode to use when a prompt template or prompt list is not found for the requested language.
-            Irrelevant for single-language use cases.
-        """
-        self.lang_code = lang_code
-        self._prompt_collection = PromptCollection(prompts_dir, fallback_mode=fallback_mode)
-
-    def _render_prompt(self, prompt_name: str, **kwargs) -> str:
-        return self._prompt_collection.render_prompt_template(prompt_name, self.lang_code, **kwargs)
-
-    def _get_prompt_list(self, prompt_name: str) -> PromptList:
-        return self._prompt_collection.get_prompt_list(prompt_name, self.lang_code)
-
-
-def autogenerate_prompt_factory_module(prompts_dir: str, target_module_path: str) -> None:
-    """
-    Autogenerates a prompt factory module for the given prompt collection directory.
-    The generated `PromptFactory` class is meant to be the central entry class for retrieving and rendering prompt templates and prompt lists
-    in your application. It will contain one method per prompt template and prompt list, and is useful for both single- and multi-language use cases.
-
-    :param prompts_dir: the directory containing the prompt templates and prompt lists
-    :param target_module_path: the path to the target module file. Important: The module will be overwritten!
-    """
-    generated_code = """
-# ruff: noqa
-# black: skip
-# mypy: ignore-errors
-
-# NOTE: This module is auto-generated from interprompt.autogenerate_prompt_factory_module, do not edit manually!
-
-from interprompt.promt_template import PromptFactoryBase, PromptList
-from typing import Any
-
-class PromptFactory(PromptFactoryBase):
-    \"""
-    A class for retrieving and rendering prompt templates and prompt lists.
-    \"""
-"""
-    # ---- add methods based on prompt template names and parameters and prompt list names ----
-    prompt_collection = PromptCollection(prompts_dir)
-
-    for template_name in prompt_collection.get_prompt_template_names():
-        template_parameters = prompt_collection.get_prompt_template_parameters(template_name)
-        render_call_str = f'"{template_name}"'
-        if len(template_parameters) == 0:
-            method_params_str = ""
-        else:
-            method_params_str = ", *, " + ", ".join([f"{param}: Any" for param in template_parameters])
-            render_call_str += ", " + ", ".join([f"{param}={param}" for param in template_parameters])
-        generated_code += f"""
-    def create_{template_name}(self{method_params_str}) -> str:
-        return self._render_prompt({render_call_str})
-"""
-    for prompt_list_name in prompt_collection.get_prompt_list_names():
-        generated_code += f"""
-    def get_list_{prompt_list_name}(self) -> PromptList:
-        return self._get_prompt_list('{prompt_list_name}')
-"""
-    os.makedirs(os.path.dirname(target_module_path), exist_ok=True)
-    with open(target_module_path, "w", encoding="utf-8") as f:
-        f.write(generated_code)
-    log.info(f"Prompt factory generated successfully in {target_module_path}")

src/interprompt/prompt_factory.py

@@ -0,0 +1,79 @@
+import logging
+import os
+from .multilang_prompt import MultiLangPromptCollection, DEFAULT_LANG_CODE, LanguageFallbackMode, PromptList
+
+
+log = logging.getLogger(__name__)
+
+
+class PromptFactoryBase:
+    """Base class for auto-generated prompt factory classes."""
+
+    def __init__(self, prompts_dir: str, lang_code: str = DEFAULT_LANG_CODE, fallback_mode=LanguageFallbackMode.EXCEPTION):
+        """
+        :param prompts_dir: the directory containing the prompt templates and prompt lists
+        :param lang_code: the language code to use for retrieving the prompt templates and prompt lists.
+            Leave as `default` for single-language use cases.
+        :param fallback_mode: the fallback mode to use when a prompt template or prompt list is not found for the requested language.
+            Irrelevant for single-language use cases.
+        """
+        self.lang_code = lang_code
+        self._prompt_collection = MultiLangPromptCollection(prompts_dir, fallback_mode=fallback_mode)
+
+    def _render_prompt(self, prompt_name: str, **kwargs) -> str:
+        return self._prompt_collection.render_prompt_template(prompt_name, self.lang_code, **kwargs)
+
+    def _get_prompt_list(self, prompt_name: str) -> PromptList:
+        return self._prompt_collection.get_prompt_list(prompt_name, self.lang_code)
+
+
+def autogenerate_prompt_factory_module(prompts_dir: str, target_module_path: str) -> None:
+    """
+    Auto-generates a prompt factory module for the given prompt directory.
+    The generated `PromptFactory` class is meant to be the central entry class for retrieving and rendering prompt templates and prompt
+    lists in your application.
+    It will contain one method per prompt template and prompt list, and is useful for both single- and multi-language use cases.
+
+    :param prompts_dir: the directory containing the prompt templates and prompt lists
+    :param target_module_path: the path to the target module file (.py). Important: The module will be overwritten!
+    """
+    generated_code = """
+# ruff: noqa
+# black: skip
+# mypy: ignore-errors
+
+# NOTE: This module is auto-generated from interprompt.autogenerate_prompt_factory_module, do not edit manually!
+
+from interprompt.multilang_prompt import PromptList
+from interprompt.prompt_factory import PromptFactoryBase
+from typing import Any
+
+class PromptFactory(PromptFactoryBase):
+    \"""
+    A class for retrieving and rendering prompt templates and prompt lists.
+    \"""
+"""
+    # ---- add methods based on prompt template names and parameters and prompt list names ----
+    prompt_collection = MultiLangPromptCollection(prompts_dir)
+
+    for template_name in prompt_collection.get_prompt_template_names():
+        template_parameters = prompt_collection.get_prompt_template_parameters(template_name)
+        render_call_str = f'"{template_name}"'
+        if len(template_parameters) == 0:
+            method_params_str = ""
+        else:
+            method_params_str = ", *, " + ", ".join([f"{param}: Any" for param in template_parameters])
+            render_call_str += ", " + ", ".join([f"{param}={param}" for param in template_parameters])
+        generated_code += f"""
+    def create_{template_name}(self{method_params_str}) -> str:
+        return self._render_prompt({render_call_str})
+"""
+    for prompt_list_name in prompt_collection.get_prompt_list_names():
+        generated_code += f"""
+    def get_list_{prompt_list_name}(self) -> PromptList:
+        return self._get_prompt_list('{prompt_list_name}')
+"""
+    os.makedirs(os.path.dirname(target_module_path), exist_ok=True)
+    with open(target_module_path, "w", encoding="utf-8") as f:
+        f.write(generated_code)
+    log.info(f"Prompt factory generated successfully in {target_module_path}")

src/serena/generated/generated_prompt_factory.py

@@ -1,13 +1,14 @@
+
 # ruff: noqa
 # black: skip
 # mypy: ignore-errors
 
 # NOTE: This module is auto-generated from interprompt.autogenerate_prompt_factory_module, do not edit manually!
 
-from interprompt.promt_template import PromptFactoryBase, PromptList
+from interprompt.multilang_prompt import PromptList
+from interprompt.prompt_factory import PromptFactoryBase
 from typing import Any
 
-
 class PromptFactory(PromptFactoryBase):
     """
     A class for retrieving and rendering prompt templates and prompt lists.