rapidframework-lib 1.0.9__py3-none-any.whl → 1.1.1__py3-none-any.whl

rapidframework/config.py

@@ -1,8 +1,8 @@
-from os import getcwd, listdir, path, makedirs
-from typing import Self, Dict
+from pathlib import Path
+from typing import Optional, Self, Dict, List
 import pkgutil
-from msgspec import json, Struct, field, DecodeError
-from subprocess import run
+from msgspec import json, Struct, DecodeError
+from subprocess import run, CalledProcessError
 from importlib.metadata import distribution
 from re import sub
 
@@ -17,9 +17,9 @@ class Config:
     
     def __init__(self) -> None:
         if not hasattr(self, "_initialized"):
-            self.source_dir = getcwd()
-            self.project_name = path.basename(self.source_dir)
-            self.source_files = listdir()
+            self.source_dir = Path.cwd()
+            self.source_files = self.source_dir.iterdir()
+            self.project_name = Path(self.source_dir).name
             self.dirs_to_create = [
                 "tests",
                 "templates",
@@ -28,27 +28,28 @@ class Config:
                 "static/js",
                 "static/images",
             ]
-            self.install = AutoManager().get_config_managers()
-            self.pkg_manager = AutoManager().get_pkg_manager()
+            manager = AutoManager()
+            self.install = manager.get_config_managers()
+            self.pkg_manager = manager.get_pkg_manager()
             self._initialized = True
 
 
-    def create_dirs(self, app_path, extra_dirs=[]) -> None:
+    def create_dirs(self, _dirs_to_create: Optional[List[str]] = None) -> None:
         dirs_to_create: list = self.dirs_to_create.copy()
-        dirs_to_create.extend(extra_dirs)
+        if _dirs_to_create:
+            dirs_to_create.extend(_dirs_to_create)
         #
         for _dir in dirs_to_create:
-            makedirs(path.join(app_path, _dir), exist_ok=True)
+            (self.source_dir / _dir).mkdir(exist_ok=True)
     
-    def create_files(self, file_paths) -> None:
-        for file_path in file_paths:
-            with open(path.join(self.source_dir, file_path), "w"): ...
+    def create_files(self, relative_file_paths: List[str]) -> None:
+        for _relative_path in relative_file_paths:
+            with open(self.source_dir /  _relative_path, "w"): ...
 
     
 class _ConfigCommands(Struct):
     install: str
     uninstall: str
-    list_: str = field(name="list")
 
 class _ConfigFormat(Struct):
     managers: Dict[str, _ConfigCommands]
@@ -57,12 +58,12 @@ class AutoManager:
     _instance = None    
     _decoder = json.Decoder(type=_ConfigFormat, strict=True)
     
-    def __new__(cls, config_name: str = "managers.json") -> Self:
+    def __new__(cls) -> Self:
         if cls._instance is None:
             cls._instance = super().__new__(cls)
         return cls._instance
     
-    def __init__(self, config_name: str = "managers.json"):
+    def __init__(self, config_name: str = "managers.json") -> None:
         if not hasattr(self, "_initialized"):
             self.config_name = config_name
             self._ConfigFormat = _ConfigFormat
@@ -87,7 +88,11 @@ class AutoManager:
         pkg = self.get_pkg_manager()
         if pkg not in managers:
             raise ValueError(f"Package manager '{pkg}' not found in configuration.")
-        run([pkg, managers[pkg].install] + libs)
+        try:
+            run([pkg, managers[pkg].install] + libs, check=True)
+        except CalledProcessError as e:
+            print(f"Failed to install packages: {e}")
+
                 
 if __name__ == "__main__":
     # Example usage of AutoManager singleton

rapidframework/configs/managers.json

@@ -2,28 +2,27 @@
     "managers": {
         "pip": {
             "install": "install",
-            "uninstall": "uninstall",
-            "list": "freeze"
+            "uninstall": "uninstall"
+        },
+        "pipx": {
+            "install": "install",
+            "uninstall": "uninstall"
+        },
+        "pyenv": {
+            "install": "install",
+            "uninstall": "uninstall"
         },
         "conda": {
             "install": "install",
-            "uninstall": "uninstall",
-            "list": "list"
+            "uninstall": "uninstall"
         },
         "uv": {
             "install": "add",
-            "uninstall": "remove",
-            "list": "pip list"
-        },
-        "pyenv": {
-            "install": "install",
-            "uninstall": "uninstall",
-            "list": "versions"
+            "uninstall": "remove"
         },
         "poetry": {
             "install": "add",
-            "uninstall": "remove",
-            "list": "show"
+            "uninstall": "remove"
         }
     }
 }

rapidframework/frameworks/django.py

@@ -1,6 +1,6 @@
 from ..template import Template
-import os
-import pathlib
+from os import path
+from pathlib import Path
 from subprocess import run
 
 
@@ -11,8 +11,8 @@ class DjangoManager(Template):
     example = True
     
     def create_example(self, example_id) -> None: 
-        package_dir = pathlib.Path(__file__).resolve().parent
+        package_dir = Path(__file__).resolve().parent
         example_folder_path = package_dir / "examples" / f"{self.framework_name}_{example_id}"     
         
-        if os.path.isdir(example_folder_path):
+        if path.isdir(example_folder_path):
             run(["django-admin", "startproject", f"--template={example_folder_path}", self.name])

rapidframework/frameworks/fastapi.py

@@ -3,11 +3,10 @@ from ..template import Template
 class FastapiManager(Template):
     extra_libs = ["sqlalchemy", "python-multipart", "databases", "python-multipart", "aiofiles", "uvicorn", "jinja2", "bcrypt"]
     extra_dirs = ["db"]
-    example = False
+    example = True
     
 class StarletteManager(FastapiManager):
     extra_libs = ["aiomysql"]
     
 class LitestarManager(StarletteManager):
     extra_libs = ["msgspec", "starlette", "httpx"]
-    example = True

rapidframework/main.py

@@ -1,31 +1,26 @@
 import argparse
 from pathlib import Path
 from . import Template
-# 
-import gc
 
-def all_subclasses(cls):
+def all_subclasses(cls) -> list[type]:
     subclasses = cls.__subclasses__()
     for subclass in subclasses:
         subclasses += all_subclasses(subclass)
     return subclasses
 
-def find_manager_class(base_name: str):
-    base_name_lower = base_name.lower()
-    target_suffix = "manager"
-
-    for obj in gc.get_objects():
-        if isinstance(obj, type):
-            cls_name = obj.__name__
-            if cls_name.lower() == base_name_lower + target_suffix:
-                return obj
+def find_manager_class(base_name: str) -> type:
+    base_name_lower = base_name.lower() + "manager"
+    for cls in all_subclasses(Template):
+        if cls.__name__.lower() == base_name_lower:
+            return cls
     raise Exception(f"Manager class for '{base_name}' not found. Ensure it is defined and imported correctly.")
 
+
 FRAMEWORKS_PATH = Path(__file__).parent / "frameworks"
 
 
 class Main:
-    def __init__(self):
+    def __init__(self) -> None:
         #
         self.available_frameworks = self._discover_frameworks()
         #
@@ -45,18 +40,18 @@ class Main:
         #
         self.framework_manager: type = find_manager_class(self.args.framework)
 
-    def _discover_frameworks(self):
+    def _discover_frameworks(self) -> list[str]:
         return sorted(set([cls.__name__.removesuffix("Manager").lower() for cls in all_subclasses(Template)]))
 
-    def run(self):
+    def run(self) -> None:
         framework = self.framework_manager(self.args.name)
         #
         if hasattr(self.framework_manager, "install_framework"):
-            framework.install_framework(version=self.args.version)
+            framework.install_framework(_version=self.args.version)
         if hasattr(self.framework_manager, "create_example"):
-            framework.create_example(1 if self.args.example is None else self.args.example)
+            framework.create_example(self.args.example or 1)
 
-def main_entry_point():
+def main_entry_point() -> None:
     Main().run()
 
 

rapidframework/template.py

@@ -1,29 +1,34 @@
-from os import path
+from pathlib import Path
 from .config import AutoManager
 from .config import Config
 from typing import Optional, List
+from copy import deepcopy
+
 
 cfg = Config()
 
 class Template:
-    extra_libs: List[str] = []
-    extra_dirs: List[str] = []
-    extra_files: List[str] = []
+    extra_libs: List[str]
+    extra_dirs: List[str]
+    extra_files: List[str]
     example: bool = True
 
-    def __init_subclass__(cls, **kwargs):
+    def __init_subclass__(cls, **kwargs) -> None:
         super().__init_subclass__(**kwargs)
-        cls.framework_name = cls.__name__.lower().replace("manager", "")
+        cls.framework_name = cls.__name__.lower().removesuffix("manager")
 
         bases = [base for base in cls.__mro__[1:] if issubclass(base, Template)]
         
+        fields = ["extra_libs", "extra_dirs", "extra_files"]
+        
         seen = set()
-        for attr in ["extra_libs", "extra_dirs", "extra_files"]:
-            values = []
-            for base in reversed(bases):
-                if base not in seen:
-                    seen.add(base)
-                    values += getattr(base, attr, [])
+        for attr in fields:
+            values = [
+                item
+                for base in reversed(bases)
+                if base not in seen and not seen.add(base)
+                for item in getattr(base, attr, [])
+            ]
             values += getattr(cls, attr, [])
             setattr(cls, attr, values)
 
@@ -34,55 +39,42 @@ class Template:
         self,
         name: str,
         framework_name: Optional[str] = None,
-        source_dir = cfg.source_dir,
-        project_name = cfg.project_name
+        source_dir: Optional[str] = None,
+        project_name: Optional[str] = None
     ):
         self.name = name
+        self.source_dir = source_dir or cfg.source_dir
+        self.project_name = project_name or cfg.project_name
         self.framework_name = framework_name or self.__class__.framework_name
-        self.source_dir = source_dir
-        self.project_name = project_name
         self.AutoManager = AutoManager()
-        self.extra_libs = self.__class__.extra_libs
-        self.extra_dirs = self.__class__.extra_dirs
-        self.extra_files = self.__class__.extra_files
+        #
+        self.extra_libs = deepcopy(self.__class__.extra_libs)
+        self.extra_dirs = deepcopy(self.__class__.extra_dirs)
+        self.extra_files = deepcopy(self.__class__.extra_files)
         self.example = self.__class__.example
         
-    def install_framework(self, **kwargs):
-        version = f"=={kwargs.get('version')}" if kwargs.get('version') else ""
-        libs_to_install: list = kwargs.get("libs") or []
-        #
-        libs_to_install.extend([f"{self.framework_name}{version}"])
-        libs_to_install.extend(self.extra_libs)
-        #
-        self.AutoManager.install_libs(libs_to_install)
-        #
-        self.setup_framework()
+    def install_framework(self, _version: Optional[str] = None) -> None:
+        self.AutoManager.install_libs(
+            [f"{self.framework_name}=={_version}"] if _version else [self.framework_name]
+            + self.extra_libs)
+        self._setup_framework()
 
-    def setup_framework(self, _source_dir: Optional[str] = None, extra_dirs: Optional[list] = None, extra_files: Optional[list] = None):
-        source_dir: str = _source_dir or self.source_dir
-        #
-        dirs = (extra_dirs or []) + self.extra_dirs
-        files = (extra_files or []) + self.extra_files
-        #
-        if dirs:
-            cfg.create_dirs(source_dir, dirs)
-        if files:
-            cfg.create_files(files)
+    def _setup_framework(self) -> None:
+        if self.extra_dirs:
+            cfg.create_dirs(self.extra_dirs)
+        if self.extra_files:
+            cfg.create_files(self.extra_files)
 
     def create_example(self, example_id) -> None:
         if self.example:
             from pkgutil import get_data
             
-            example_code = get_data(
-                "rapidframework",
-                f"frameworks/examples/{self.framework_name}_{example_id}.py",
-            )
-            if not example_code:
-                raise Exception(f"Example {example_id} not found for {self.framework_name} framework.")
+            example_code = get_data("rapidframework", f"frameworks/examples/{self.framework_name}_{example_id}.py")
             
-            with open(
-                path.join(self.source_dir, self.name + ".py"), "w", encoding="utf-8"
-            ) as example_file:
-                example_file.write(example_code.decode("utf-8"))
+            if example_code is None:
+                raise FileNotFoundError(f"Example {example_id} not found for {self.framework_name} framework.")
+
+            with open(Path(self.source_dir) / f"{self.name}.py", "w", encoding="utf-8") as f:
+                f.write(example_code.decode("utf-8"))
         else:
-            raise Exception("Example method is'n allowed for this framework !")
+            raise NotImplementedError(f"Example creation is not implemented for {self.framework_name} framework.")

{rapidframework_lib-1.0.9.dist-info → rapidframework_lib-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rapidframework-lib
-Version: 1.0.9
+Version: 1.1.1
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: msgspec
@@ -13,7 +13,7 @@ Dynamic: requires-dist
 
 > **RapidFramework** is a Python library for quickly creating and setting up projects from templates.
 
-## https://pypi.org/project/rapidframework-lib/1.0.9/
+## https://pypi.org/project/rapidframework-lib/1.1.1/
 
 ## Installation
 

{rapidframework_lib-1.0.9.dist-info → rapidframework_lib-1.1.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
 rapidframework/__init__.py,sha256=0f6S18Vy0QQs3VW9m4A6sNDfHoYGvf9Dzk32xlZ5RNs,151
-rapidframework/config.py,sha256=xfsmdtMfmOSe6LXLMkDWbTiPdRHPSRhLkICvvk2I0Ug,3470
-rapidframework/main.py,sha256=9c-iaW4QAnVFLgHVBz6oYqhx8-QnlPOI6XBt9yrNoqU,2129
-rapidframework/template.py,sha256=Km9hI435jh_GjZmjWjqRA-DdE0QxBBF20IuFcQTUC4c,3148
+rapidframework/config.py,sha256=xjPI8DIxkd9sbAlSsIUIYYfoDHqFPxQshOGVzxXldmY,3657
+rapidframework/main.py,sha256=xY7c4YaUG1YtN-V1LOV8maMRTGueLYptOGSuWN3DPc0,2045
+rapidframework/template.py,sha256=-_cugFwyhyxz6SPvT95fThzK83x361Rkr51_yK6LpSY,2864
 rapidframework/__pycache__/main.cpython-313.pyc,sha256=J3Y41E5fOwmGEQtwgTq-NBUl0s0VxCvDC5KUnCGvIdU,3891
-rapidframework/configs/managers.json,sha256=EEBDjTVQuNXGIF_oIXuNVpXK4kTk2HsRb2aPrbmUjo4,664
+rapidframework/configs/managers.json,sha256=xTBE-UB7atZ5VgLEtK78SdVkimQ762E025rtMR_gjsM,614
 rapidframework/frameworks/__init__.py,sha256=CJETvRzO000nPloWwKFd-AnLmR5PM9SSZUyB-C4M8a4,464
-rapidframework/frameworks/django.py,sha256=eG69Sdn4ALn0fAXeY1TknJgTvcut8TArDybluPjF_Jo,792
-rapidframework/frameworks/fastapi.py,sha256=vZ06QrsTJqzasnt1q7Bph59F3CcoKz_xuAv8CEcUFU8,428
+rapidframework/frameworks/django.py,sha256=DCdQvmyLeBjVfMAAZIVSgIWVplcTL0pIfnFsY3eKSTU,801
+rapidframework/frameworks/fastapi.py,sha256=k24ECko0eRfYYJNUueE0506DMoc1R5C8_JZ_OxRG24I,408
 rapidframework/frameworks/simple_frameworks.py,sha256=9PEu-ZvA17pT7QLQTnfQ_2PGjCDbi8ECaaSO1MPp2Lg,1023
 rapidframework/frameworks/examples/__init__.py,sha256=ovguP4wzQEDNguczwiZnhMm4dRRVcvnzmHrfQtlRCNQ,15
 rapidframework/frameworks/examples/bottle_1.py,sha256=AhEqgse_IinZ0jx211y0ybyxB0dknGI-x6zhIOQ4Qos,118
@@ -32,9 +32,9 @@ rapidframework/frameworks/examples/django_1/project_name/users/admin.py-tpl,sha2
 rapidframework/frameworks/examples/django_1/project_name/users/models.py-tpl,sha256=BDqPNCqoqDWPRTQJZjyRQSk9zwPVV14HLKtjS-qtKz8,89
 rapidframework/frameworks/examples/django_1/project_name/users/migrations/0001_initial.py-tpl,sha256=V-yCkAE_F0oWEAG4xcSLPOjxnbD3sPble_On_Ny49kA,2931
 rapidframework/frameworks/examples/django_1/project_name/users/migrations/__init__.py-tpl,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rapidframework_lib-1.0.9.dist-info/licenses/LICENSE,sha256=lXsPzvyEfL6vjzMMCRYi7gpsIjpSUYUsDF-MvMHyhc0,1070
-rapidframework_lib-1.0.9.dist-info/METADATA,sha256=tsriVBHgFt36eExvJ8rloKzHLAlB-qq44W_-B5TBtzA,1242
-rapidframework_lib-1.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rapidframework_lib-1.0.9.dist-info/entry_points.txt,sha256=UaOaGJ-BDCxtmNoPp-u_TnXXLbnXtrB13PYr5BgqmHA,72
-rapidframework_lib-1.0.9.dist-info/top_level.txt,sha256=7PXDkFZsYowz4aB2xVaSso4qD45jd2kHn6x3xxhMMNs,15
-rapidframework_lib-1.0.9.dist-info/RECORD,,
+rapidframework_lib-1.1.1.dist-info/licenses/LICENSE,sha256=lXsPzvyEfL6vjzMMCRYi7gpsIjpSUYUsDF-MvMHyhc0,1070
+rapidframework_lib-1.1.1.dist-info/METADATA,sha256=wSaoLzQcZXxq8Pns1bwrNIEEpApHtjQMCtejpg8C42c,1242
+rapidframework_lib-1.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rapidframework_lib-1.1.1.dist-info/entry_points.txt,sha256=UaOaGJ-BDCxtmNoPp-u_TnXXLbnXtrB13PYr5BgqmHA,72
+rapidframework_lib-1.1.1.dist-info/top_level.txt,sha256=7PXDkFZsYowz4aB2xVaSso4qD45jd2kHn6x3xxhMMNs,15
+rapidframework_lib-1.1.1.dist-info/RECORD,,