jknife 0.0.10__tar.gz → 0.0.12__tar.gz

{jknife-0.0.10 → jknife-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jknife
-Version: 0.0.10
+Version: 0.0.12
 Summary: Custom FastAPI for luna-negra
 Author: luna-negra
 License-Expression: MIT

{jknife-0.0.10 → jknife-0.0.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "jknife"
-version = "0.0.10"
+version = "0.0.12"
 authors = [
   { name="luna-negra", email="" },
 ]

{jknife-0.0.10 → jknife-0.0.12}/src/jknife/commands/jknife.py

@@ -21,9 +21,9 @@ Usage: jknife [sub_command] [3rd argument]
 --reload                        : reload uvicorn server automatically after editing source.
 """
 
-# Template for models/APP_NAME.py
-MODULE_IMPORT_STRING_MODELS: str = """
-# import packages from default or pip library
+# Template for APP_NAME.py in each folder.
+MODULE_IMPORT_STRING_DICT: dict = {
+    "models": """# import packages from default or pip library
 from typing_extensions import Annotated, Doc
 
 # import packages from this framework below
@@ -33,10 +33,8 @@ from typing_extensions import Annotated, Doc
 
 
 # define your own customising class below
-"""
-
-# Template for routers/APP_NAME.py
-MODULE_IMPORT_STRING_ROUTERS: str = """# import packages from default or pip library
+""",
+    "routers": """# import packages from default or pip library
 from fastapi import APIRouter, Depends, status, HTTPException
 from typing_extensions import Annotated, Doc
 
@@ -48,10 +46,8 @@ router = APIRouter(prefix="/{}",
                    tags=['{}'])
 
 # define your own customising class below
-"""
-
-# Template for views/APP_NAME.py
-MODULE_IMPORT_STRING_VIEWS: str = """# import packages from default or pip library
+""",
+    "views": """# import packages from default or pip library
 from pydantic import BaseModel, field_validator, ValidationError
 
 # import packages from this framework below
@@ -62,13 +58,14 @@ from pydantic import BaseModel, field_validator, ValidationError
 
 # define your own customising class below
 """
+}
 
 # WARN MSGs
 WARN_MSG_ALREADY_EXIST_PROJECT: str = """
-[WARNING] You already have project '{}'.
+[WARNING] You already have project named '{}'.
 """
-WARN_MSG_IMPOSSIBLE_RUNSERVER_OUT_OF_PROJECT: str = """
-[WARNING] You have to execute 'runserver' command in your project folder.
+WARN_MSG_ALREADY_EXIST_APP: str = """
+[WARNING] You already have app named '{}'.
 """
 
 # ERROR MSGs
@@ -78,6 +75,9 @@ ERROR_MSG_START_PROJECT: str = """
 
 * Command for Starting Project: jknife startproject [PROJECT_NAME]
 """
+ERROR_MSG_IMPOSSIBLE_RUNSERVER_OUT_OF_PROJECT: str = """
+[ERROR] You have to execute 'runserver' command in your project folder.
+"""
 
 # File Contents
 CONTENTS_IN_SETTINGS: str = """# this file is charge of config for custom fastapi.
@@ -319,24 +319,25 @@ def startproject(pjt_name: str) -> None:
 def createapp(app_name: str) -> None:
     # check main folders for jknife
     for folder_name in FOLDER_LIST:
-       try:
-           if os.listdir(folder_name):
+        try:
+            if not os.listdir(folder_name):
                 with open(f"{folder_name}/__init__.py", "w") as f:
                     f.write("")
 
-       except FileNotFoundError:
-           print(ERROR_MSG_START_PROJECT)
-           return None
+            if f"{app_name}.py" not in os.listdir(folder_name):
+                with open(f"{folder_name}/{app_name}.py", "w") as f:
+                    f.write(MODULE_IMPORT_STRING_DICT.get(folder_name))
 
-    # create app.py in 'models' folder
-    with open(f"models/{app_name}.py", "w") as f:
-        f.write(MODULE_IMPORT_STRING_MODELS)
+            else:
+                raise AttributeError
 
-    with open(f"routers/{app_name}.py", "w") as f:
-        f.write(MODULE_IMPORT_STRING_ROUTERS.format(app_name, app_name))
+        except FileNotFoundError:
+            print(ERROR_MSG_START_PROJECT)
+            return None
 
-    with open(f"views/{app_name}.py", "w") as f:
-        f.write(MODULE_IMPORT_STRING_VIEWS)
+        except AttributeError:
+            print(WARN_MSG_ALREADY_EXIST_APP.format(app_name))
+            return None
 
     return None
 
@@ -347,7 +348,7 @@ def help_msg():
 def run_server(options: list, app_name: str = "main"):
     for f in FOLDER_LIST:
         if f not in os.listdir():
-            print(WARN_MSG_IMPOSSIBLE_RUNSERVER_OUT_OF_PROJECT)
+            print(ERROR_MSG_IMPOSSIBLE_RUNSERVER_OUT_OF_PROJECT)
             return None
 
     args = " ".join([ option.replace("=", " ") for option in options ])