instant-python 0.0.1__tar.gz → 0.2.0__tar.gz

instant_python-0.2.0/.github/workflows/pages.yml

@@ -0,0 +1,34 @@
+name: Publish to GitHub pages
+
+on:
+  push:
+    branches:
+      - main
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: write
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  pages:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/python_setup
+      - name: Build documentation
+        run: uv run mkdocs build
+      - name: Deploy to GitHub Pages
+        run: uv run mkdocs gh-deploy --force
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

{instant_python-0.0.1 → instant_python-0.2.0}/.github/workflows/release.yml

@@ -1,9 +1,7 @@
 name: Generate Release
 
 on:
-  push:
-    branches:
-      - main
+  workflow_dispatch:
 
 jobs:
   bump-version:

{instant_python-0.0.1 → instant_python-0.2.0}/CHANGELOG.md

@@ -1,65 +1,55 @@
-## 0.12.1 (2025-04-06)
-
-### 🐛 Bug Fixes
-
-- **project-generator**: add template types values to be able to use enum in jinja templates
-- **template**: write correct option when fastapi built in feature is selected
-
-### ♻️ Code Refactoring
-
-- **template**: include mypy, git and pytest configuration files only when the user has selected these options
-- **template**: include dependencies depending on user built in features selection
-
-## 0.12.0 (2025-04-06)
+## 0.2.0 (2025-04-08)
 
 ### ✨ Features
 
-- **project-generator**: create new custom function to generate import path in templates
+- **template**: add new rabbit mq error when user selects event bus built in feature
+- **template**: create rabbit_mq_connection_not_established_error.py boilerplate
 
 ### 🐛 Bug Fixes
 
-- **template**: generate correctly the import statement in templates depending on the user selection
-
-## 0.11.0 (2025-03-24)
-
-## 0.10.4 (2025-03-24)
+- **template**: correct domain event type not found error import and class name
+- **template**: set event bus publish method async
+- **template**: correct imports in value objects boilerplate
 
-### 🐛 Bug Fixes
+### ♻️ Code Refactoring
 
-- correct pages workflow
+- **installer**: add virtual environment creation before installing dependencies
+- **template**: conditionally include bounded context based on specify_bounded_context field
+- **template**: add specify_bounded_context field to user requirements
+- **prompter**: be able to execute nested conditional questions
+- **template**: update subquestions structure to use ConditionalQuestion for bounded context specification
+- **prompter**: extend ConditionalQuestion subquestions type hint
+- **prompter**: remove note when prompting built in features for the user to select and remove temporarily synch sql alchemy option
+- **template**: modify project structure templates to include logger and alembic migrator automatically if fastapi application is selected
+- **template**: modify DomainEventSubscriber boilerplate to follow generic type syntax depending on python version
 
-## 0.10.3 (2025-03-24)
+## 0.1.1 (2025-04-08)
 
 ### 🐛 Bug Fixes
 
-- correct pages workflow
+- **template**: correct typo in ExchangeType enum declaration
+- **template**: correct typo on TypeVar declaration
 
-## 0.10.2 (2025-03-24)
+### ♻️ Code Refactoring
 
-### 🐛 Bug Fixes
+- **question**: use old generic type syntax to keep compatibility with old python versions
+- **template**: update boilerplates so they can adhere to correct python versions syntax
+- **project-generator**: standardize path separator in file name construction
+- **installer**: remove unused enum OperatingSystems
+- **prompter**: change TemplateTypes class to inherit from str and Enum for improved compatibility
+- **project-generator**: change NodeType class to inherit from str and Enum for improved compatibility
+- **installer**: change Managers class to inherit from str and Enum for better compatibility
+- **project-generator**: remove override typing decorator to allow lower python versions compatibility
 
-- **installer**: correct answers when installing dependencies
-
-## 0.10.1 (2025-03-24)
+## 0.1.0 (2025-04-06)
 
 ### 🐛 Bug Fixes
 
+- **project-generator**: add template types values to be able to use enum in jinja templates
+- **template**: write correct option when fastapi built in feature is selected
+- **template**: generate correctly the import statement in templates depending on the user selection
+- **installer**: correct answers when installing dependencies
 - **prompter**: modify DependenciesQuestion to not enter an infinite loop of asking the user
-
-## 0.10.0 (2025-03-23)
-
-### ✨ Features
-
-- **prompter**: implement general project step that will only be used when custom template is passed
-- **cli**: add template command for project_cli.py to let users create a project using a custom template
-- **prompter**: implement ConditionalQuestion
-- **prompter**: implement TemplateStep to group all questions related to default template management
-- **project-generator**: implement CustomTemplateManager to manage when user passes a custom template file
-- **project-generator**: create TemplateManager interface
-- **cli**: add folder command to allow users to just generate the folder structure of the project
-
-### 🐛 Bug Fixes
-
 - **cli**: temporarily disable template commands
 - **prompter**: extract the value of the base answer to check it with condition
 - **prompter**: remove init argument from year field
@@ -67,9 +57,18 @@
 - **prompter**: set default value for git field in UserRequirements to avoid failing when executing folder command
 - **prompter**: include last question in TemplateStep if selected template is domain_driven_design
 - **project-generator**: instantiate DefaultTemplateManager inside File class
+- **build**: change build system and ensure templates directory gets included
+- **project-generator**: substitute FileSystemLoader for PackageLoader to safer load when using it as a package
+- **prompter**: correct default source folder name
+- **template**: correct license field from pyproject.toml template
+- **template**: use project_slug for project name inside pyproject.toml
+- **project-generator**: correct path to templates
+- **project-generator**: correct extra blocks that where being created when including templates
 
 ### ♻️ Code Refactoring
 
+- **template**: include mypy, git and pytest configuration files only when the user has selected these options
+- **template**: include dependencies depending on user built in features selection
 - **prompter**: update answers dictionary instead of add manually question key and answer
 - **prompter**: return a dictionary with the key of the question and the answer instead of just the answer
 - **cli**: modify cli help commands and descriptions
@@ -93,86 +92,19 @@
 - **cli**: add help description to both commands
 - **prompter**: move python and dependency manager from dependencies step to general project step as it's information that is needed in general to fill all files information
 - **cli**: rename generate_project command to new
-
-## 0.9.0 (2025-03-14)
-
-### ✨ Features
-
-- **project-generator**: format all project files with ruff once everything is generated
-- **cli**: remove user_requirements file once project has been generated
-- **prompter**: add remove method to UserRequirements class
-
-### 🐛 Bug Fixes
-
-- **build**: change build system and ensure templates directory gets included
-- **project-generator**: substitute FileSystemLoader for PackageLoader to safer load when using it as a package
-
-### ♻️ Code Refactoring
-
 - **prompter**: add file_path field to user requirements class
-
-## 0.8.1 (2025-03-14)
-
-### 🐛 Bug Fixes
-
-- **prompter**: correct default source folder name
-- **template**: correct license field from pyproject.toml template
-
-### ♻️ Code Refactoring
-
 - **cli**: pass project slug name as the project directory that will be created
 - **project-generator**: pass the directory where the project will be created to FolderTree
 - **cli**: remove checking if a user_requirements file exists
 - **template**: remove writing author and email info only if manager is pdm
-
-## 0.8.0 (2025-03-11)
-
-### ✨ Features
-
-- **cli**: call to git configurer when user wants to initialize a git repository
-- **installer**: implement GitConfigurer
-- **cli**: include git step into cli steps
-- **prompter**: implement step to ask the user information to initialize a git repository
-
-### ♻️ Code Refactoring
-
 - **installer**: avoid printing executed commands output by stdout
 - **template**: use git_email field in pyproject.toml
 - **prompter**: remove email field from UserRequirements and add git_email and git_user_name
 - **prompter**: remove email question from general project step
-
-## 0.7.0 (2025-03-11)
-
-### ✨ Features
-
-- **template**: add clean architecture template project structure
-
-## 0.6.0 (2025-03-11)
-
-### ✨ Features
-
-- **template**: add standard project project structure templates
-
-### ♻️ Code Refactoring
-
 - **project-generator**: remove condition of loading the template only when is domain driven design
 - **template**: use include_and_indent custom macro inside domain_driven_design/test template
 - **template**: include always mypy and pytest ini configuration
 - **prompter**: rename empty project template to standard project
-
-## 0.5.0 (2025-03-10)
-
-### ✨ Features
-
-- **installer**: create factory method to choose which dependency manager gets instantiated
-- **installer**: implement PdmInstaller
-
-### 🐛 Bug Fixes
-
-- **template**: use project_slug for project name inside pyproject.toml
-
-### ♻️ Code Refactoring
-
 - **cli**: use DependencyManagerFactory instead of always instantiating UvManager
 - **installer**: remove ShellConfigurator and ZshConfigurator
 - **cli**: remove shell configurator injection
@@ -180,11 +112,86 @@
 - **prompter**: warn the user that project name cannot contain spaces
 - **prompter**: remove project name question and just leave project slug
 - **installer**: remove executable attribute from UvManager
+- **installer**: specify working directory to UvManager so it installs everything at the generated project
+- **cli**: pass generated project path to UvManager
+- **installer**: inline uv install command attribute as is not something reusable
+- **cli**: inject folder tree and template manager to project generator
+- **project-generator**: set the directory where user project will be generated as FolderTree attribute and expose it through a property
+- **project-generator**: pass folder_tree and template_manager injected into ProjectGenerator
+- **cli**: pass user dependencies to installer
+- **prompter**: substitute fixed default dependencies by dynamic ones that will be asked to the user
+- **prompter**: remove question definition lists and basic prompter
+- **cli**: substitute BasicPrompter for QuestionWizard
+- **prompter**: remove python manager and operating system questions
+- **prompter**: extract helper method to know if template is ddd
+- **prompter**: delegate ask logic to each question instead of letting prompter what to do depending on flags
+- **prompter**: redefine questions using concrete implementations
+- **prompter**: make Question abstract and add ask abstract method
+- **project-generator**: rename Directory's init attribute to python_module and remove default value for children
+- **project-generator**: move children extraction only when node is a directory
+- **src**: remove old src folder with cookiecutter project and convert current instant_python module into src
+- **cli**: generate user requirements only if no other file has been already generated.
+- **template**: move makefile template to scripts folder as this folder only makes sense if it's use with the makefile
+- **template**: move base from sync sqlalchemy to persistence folder as it would be the same for both sync and async
+- **template**: move sqlalchemy sync templates to specific folder
+- **template**: move exceptions templates to specific folder
+- **template**: move value object templates to specific folder
+- **template**: move github actions templates to specific folder
+- **template**: move logger templates to specific folder
+- **project-generator**: modify File class to be able to manage the difference between the path to the template and the path where the file should be written
+- **template**: change all yml templates to point to inner event_bus folder boilerplate
+- **template**: move all boilerplate related to event bus inside specific folder
+- **prompter**: change github information for basic name and email
+- **prompter**: move default dependencies question to general questions and include the default dependencies that will be included
+- **prompter**: remove converting to snake case all answers and set directly those answers in snake case if needed
+- **templates**: use raw command inside github action instead of make
+- **templates**: modify error templates to use DomainError
+- **templates**: change all python-module types to directory and add python flag when need it
+- **project-generator**: make Directory general for any type of folder and remove python module class
+- **project-generator**: remove python_module node type
+- **templates**: set all files of type file and add them the extension variable
+- **project-generator**: add extension field to node and remove deprecated options
+- **project-generator**: create a single node type File that will work with any kind of file
+- **project-generator**: substitute python file and yml file node type for single file
+- **templates**: use new operator to write a single children command in source
+- **project-generator**: include new custom operator in jinja environment
+- **templates**: remove populated shared template
+- **templates**: include value objects template when is specified by the user
+- **templates**: import and call macro inside project structures templates
+- **prompter**: format all answers to snake case
+- use TemplateTypes instead of literal string
+- **project-generator**: change template path name when generating project
+- **templates**: move ddd templates inside project_structure folder
+- **prompter**: migrate BasicPrompter to use questionary instead of typer to make the questions as it manages multiple selections better
+- **cli**: instantiate BasicPrompter instead of using class method
+- **prompter**: simplify ask method by using Question object an iterating over the list of defined questions
+- **templates**: modularize main_structure file
+- **project-generator**: create project structure inside a temporary directory
+- **project-generator**: delegate template management to TemplateManager
+- **cli**: call BasicPrompter and ProjectGenerator inside cli app
 
-## 0.4.0 (2025-03-09)
 
 ### ✨ Features
 
+- **project-generator**: create new custom function to generate import path in templates
+- **prompter**: implement general project step that will only be used when custom template is passed
+- **cli**: add template command for project_cli.py to let users create a project using a custom template
+- **prompter**: implement ConditionalQuestion
+- **prompter**: implement TemplateStep to group all questions related to default template management
+- **project-generator**: implement CustomTemplateManager to manage when user passes a custom template file
+- **project-generator**: create TemplateManager interface
+- **cli**: add folder command to allow users to just generate the folder structure of the project
+- **project-generator**: format all project files with ruff once everything is generated
+- **cli**: remove user_requirements file once project has been generated
+- **prompter**: add remove method to UserRequirements class
+- **cli**: call to git configurer when user wants to initialize a git repository
+- **installer**: implement GitConfigurer
+- **cli**: include git step into cli steps
+- **prompter**: implement step to ask the user information to initialize a git repository
+- **template**: add clean architecture template project structure
+- **template**: add standard project project structure templates
+- **installer**: create factory method to choose which dependency manager gets instantiated
+- **installer**: implement PdmInstaller
 - **project-generator**: expose generated project path through ProjectGenerator
 - **installer**: add project_directory field to UvManager to know where to create the virtual environment
 - **installer**: add install_dependencies step to Installer
@@ -211,36 +218,6 @@
 - **project-generator**: create custom exception when node type does not exist
 - **cli**: make sure user_requirements are loaded
 - **prompter**: add load_from_file method to UserRequirements
-
-### 🐛 Bug Fixes
-
-- **project-generator**: correct path to templates
-
-### ♻️ Code Refactoring
-
-- **installer**: specify working directory to UvManager so it installs everything at the generated project
-- **cli**: pass generated project path to UvManager
-- **installer**: inline uv install command attribute as is not something reusable
-- **cli**: inject folder tree and template manager to project generator
-- **project-generator**: set the directory where user project will be generated as FolderTree attribute and expose it through a property
-- **project-generator**: pass folder_tree and template_manager injected into ProjectGenerator
-- **cli**: pass user dependencies to installer
-- **prompter**: substitute fixed default dependencies by dynamic ones that will be asked to the user
-- **prompter**: remove question definition lists and basic prompter
-- **cli**: substitute BasicPrompter for QuestionWizard
-- **prompter**: remove python manager and operating system questions
-- **prompter**: extract helper method to know if template is ddd
-- **prompter**: delegate ask logic to each question instead of letting prompter what to do depending on flags
-- **prompter**: redefine questions using concrete implementations
-- **prompter**: make Question abstract and add ask abstract method
-- **project-generator**: rename Directory's init attribute to python_module and remove default value for children
-- **project-generator**: move children extraction only when node is a directory
-- **src**: remove old src folder with cookiecutter project and convert current instant_python module into src
-
-## 0.3.0 (2025-03-01)
-
-### ✨ Features
-
 - **template**: include mock event bus template for testing
 - **template**: add scripts templates
 - **prompter**: add fastapi option to built in features
@@ -260,29 +237,6 @@
 - **templates**: add .gitignore template
 - **templates**: add pyproject template
 - **templates**: add makefile template
-
-### ♻️ Code Refactoring
-
-- **cli**: generate user requirements only if no other file has been already generated.
-- **template**: move makefile template to scripts folder as this folder only makes sense if it's use with the makefile
-- **template**: move base from sync sqlalchemy to persistence folder as it would be the same for both sync and async
-- **template**: move sqlalchemy sync templates to specific folder
-- **template**: move exceptions templates to specific folder
-- **template**: move value object templates to specific folder
-- **template**: move github actions templates to specific folder
-- **template**: move logger templates to specific folder
-- **project-generator**: modify File class to be able to manage the difference between the path to the template and the path where the file should be written
-- **template**: change all yml templates to point to inner event_bus folder boilerplate
-- **template**: move all boilerplate related to event bus inside specific folder
-- **prompter**: change github information for basic name and email
-- **prompter**: move default dependencies question to general questions and include the default dependencies that will be included
-- **prompter**: remove converting to snake case all answers and set directly those answers in snake case if needed
-- **templates**: use raw command inside github action instead of make
-
-## 0.2.0 (2025-02-27)
-
-### ✨ Features
-
 - **templates**: add invalid id format error template
 - **templates**: add domain error template
 - **prompter**: add synchronous sqlalchemy option to built in features question
@@ -316,33 +270,3 @@
 - **prompter**: create basic class that asks project requirements to user
 - **cli**: create basic typer application with no implementation
 
-### 🐛 Bug Fixes
-
-- **project-generator**: correct extra blocks that where being created when including templates
-
-### ♻️ Code Refactoring
-
-- **templates**: modify error templates to use DomainError
-- **templates**: change all python-module types to directory and add python flag when need it
-- **project-generator**: make Directory general for any type of folder and remove python module class
-- **project-generator**: remove python_module node type
-- **templates**: set all files of type file and add them the extension variable
-- **project-generator**: add extension field to node and remove deprecated options
-- **project-generator**: create a single node type File that will work with any kind of file
-- **project-generator**: substitute python file and yml file node type for single file
-- **templates**: use new operator to write a single children command in source
-- **project-generator**: include new custom operator in jinja environment
-- **templates**: remove populated shared template
-- **templates**: include value objects template when is specified by the user
-- **templates**: import and call macro inside project structures templates
-- **prompter**: format all answers to snake case
-- use TemplateTypes instead of literal string
-- **project-generator**: change template path name when generating project
-- **templates**: move ddd templates inside project_structure folder
-- **prompter**: migrate BasicPrompter to use questionary instead of typer to make the questions as it manages multiple selections better
-- **cli**: instantiate BasicPrompter instead of using class method
-- **prompter**: simplify ask method by using Question object an iterating over the list of defined questions
-- **templates**: modularize main_structure file
-- **project-generator**: create project structure inside a temporary directory
-- **project-generator**: delegate template management to TemplateManager
-- **cli**: call BasicPrompter and ProjectGenerator inside cli app

{instant_python-0.0.1 → instant_python-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: instant-python
-Version: 0.0.1
+Version: 0.2.0
 Summary: Python automatic project generator
 Author-email: dimanu-py <diegomtz126@gmail.com>
 License:                                  Apache License
@@ -205,7 +205,7 @@ License:                                  Apache License
            See the License for the specific language governing permissions and
            limitations under the License.
 License-File: LICENSE
-Requires-Python: >=3.12
+Requires-Python: >=3.9
 Requires-Dist: jinja2>=3.1.5
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: questionary>=2.1.0

{instant_python-0.0.1 → instant_python-0.2.0}/docs/contributing.md

@@ -1,10 +1,13 @@
-# Contributing
+# Contributing & Reporting
 
 If you would like to contribute and help to improve this library feel free to fork this project and create a pull request.
 
 You may as well check out the [open issues](https://github.com/dimanu-py/instant-python/issues) to see whether somebody is already 
 addressing your problem or solve your doubts. If not, feel free to open a new issue with any improvement that can be made.
 
+Any bug that you find is welcome to be reported. Please make sure to include as much information as possible and follow the
+correct templates. This will help us to understand the problem and fix it as soon as possible.
+
 If you find this library useful and want to help, you can also give it a star on GitHub or donate in the following link
 
 [![Donate](https://img.shields.io/badge/Buy_me_a_coffee-5d83f5?style=for-the-badge&logo=ko-fi&logoColor=white&__cf_chl_managed_tk__=pmd_sOkOcrsQ4T6MRVPX2TeB_mbk2ZryAIn3rNigWIBBC6U-1633993526-0-gqNtZGzNAyWjcnBszQkl)](https://buymeacoffee.com/dimanu.py)

{instant_python-0.0.1 → instant_python-0.2.0}/instant_python/installer/managers.py

@@ -1,7 +1,7 @@
-from enum import StrEnum
+from enum import Enum
 
 
-class Managers(StrEnum):
+class Managers(str, Enum):
     PYENV = "pyenv"
     UV = "uv"
     PDM = "pdm"

{instant_python-0.0.1 → instant_python-0.2.0}/instant_python/installer/pdm_manager.py

@@ -31,6 +31,7 @@ class PdmManager(DependencyManager):
         print(f">>> Python {version} installed successfully")
 
     def install_dependencies(self, dependencies: list[str]) -> None:
+        self._create_virtual_environment()
         for dependency_name in dependencies:
             self._install_dependency(dependency_name)
 
@@ -67,6 +68,12 @@ class PdmManager(DependencyManager):
             group_flag += f"--group {group_name}"
         return f"{dev_flag} {group_flag}"
 
-
-
-
+    def _create_virtual_environment(self) -> None:
+        command = f"{self._pdm} install"
+        subprocess.run(
+            command,
+            shell=True,
+            check=True,
+            cwd=self._project_directory,
+            stdout=subprocess.DEVNULL,
+        )

{instant_python-0.0.1 → instant_python-0.2.0}/instant_python/installer/uv_manager.py

@@ -33,6 +33,7 @@ class UvManager(DependencyManager):
         print(f">>> Python {version} installed successfully")
 
     def install_dependencies(self, dependencies: list[str]) -> None:
+        self._create_virtual_environment()
         for dependency_name in dependencies:
             self._install_dependency(dependency_name)
 
@@ -71,3 +72,13 @@ class UvManager(DependencyManager):
             ).ask()["group_name"]
             flag = f"--group {group_name}"
         return flag
+
+    def _create_virtual_environment(self) -> None:
+        command = f"{self._uv} sync"
+        subprocess.run(
+            command,
+            shell=True,
+            check=True,
+            cwd=self._project_directory,
+            stdout=subprocess.DEVNULL,
+        )

{instant_python-0.0.1 → instant_python-0.2.0}/instant_python/project_generator/custom_template_manager.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import override
 
 import yaml
 
@@ -10,7 +9,6 @@ class CustomTemplateManager(TemplateManager):
     def __init__(self, template_path: str) -> None:
         self._template_path = Path(template_path).expanduser().resolve()
 
-    @override
     def get_project(self, template_name: str) -> dict[str, str]:
         if not self._template_path.is_file():
             raise FileNotFoundError(

{instant_python-0.0.1 → instant_python-0.2.0}/instant_python/project_generator/default_template_manager.py

@@ -1,5 +1,3 @@
-from typing import override
-
 import yaml
 from jinja2 import Environment, Template, PackageLoader
 
@@ -20,7 +18,6 @@ class DefaultTemplateManager(TemplateManager):
         self._env.filters["is_in"] = is_in
         self._env.filters["compute_base_path"] = compute_base_path
 
-    @override
     def get_project(self, template_name: str) -> dict:
         template = self._get_template(
             f"{template_name}/{self._requirements.template}/main_structure.yml.j2"

{instant_python-0.0.1 → instant_python-0.2.0}/instant_python/project_generator/file.py

@@ -7,7 +7,7 @@ from instant_python.project_generator.node import Node
 class File(Node):
 
     def __init__(self, name: str, extension: str) -> None:
-        self._file_name = f"{name.split("/")[-1]}{extension}"
+        self._file_name = f"{name.split('/')[-1]}{extension}"
         self._template_path = f"boilerplate/{name}{extension}"
         self._template_manager = DefaultTemplateManager()
 

{instant_python-0.0.1 → instant_python-0.2.0}/instant_python/project_generator/node.py

@@ -1,9 +1,9 @@
 from abc import ABC, abstractmethod
-from enum import StrEnum
+from enum import Enum
 from pathlib import Path
 
 
-class NodeType(StrEnum):
+class NodeType(str, Enum):
     DIRECTORY = "directory"
     FILE = "file"
 

{instant_python-0.0.1 → instant_python-0.2.0}/instant_python/question_prompter/question/conditional_question.py

@@ -1,9 +1,11 @@
+from typing import Union
+
 from instant_python.question_prompter.question.question import Question
 
 
 class ConditionalQuestion:
     def __init__(
-        self, base_question: Question, subquestions: list[Question], condition: str | bool
+        self, base_question: Question, subquestions: Union[list[Question], "ConditionalQuestion"], condition: str | bool
     ) -> None:
         self._base_question = base_question
         self._subquestions = subquestions
@@ -16,8 +18,12 @@ class ConditionalQuestion:
             return base_answer
 
         answers = base_answer
-        for question in self._subquestions:
-            answers.update(question.ask())
+        
+        if isinstance(self._subquestions, ConditionalQuestion):
+            answers.update(self._subquestions.ask())
+        else:
+            for question in self._subquestions:
+                answers.update(question.ask())
         return answers
 
     def _base_answer_does_not_satisfies_condition(self, base_answer: dict[str, str]) -> bool:

{instant_python-0.0.1 → instant_python-0.2.0}/instant_python/question_prompter/question/question.py

@@ -1,7 +1,10 @@
 from abc import ABC, abstractmethod
 
+from typing import TypeVar, Generic
 
-class Question[T](ABC):
+T = TypeVar("T")
+
+class Question(Generic[T], ABC):
     def __init__(self, key: str, message: str) -> None:
         self._key = key
         self._message = message