jknife 0.0.8__py2.py3-none-any.whl → 0.0.11__py2.py3-none-any.whl

jknife/commands/jknife.py

@@ -1,5 +1,6 @@
 import sys
 import os
+import subprocess
 
 
 FOLDER_LIST: tuple = ("models", "routers", "views", )
@@ -12,7 +13,7 @@ Usage: jknife [sub_command] [3rd argument]
 * sub_command:
 - startproject [PROJECT_NAME]   : create project filesystem
 - createapp [APP_NAME]          : create API application in project
-- run [OPTIONS]                 : run server with uvicorn
+- runserver [OPTIONS]                 : run server with uvicorn
 
 [run OPTIONS]
 --host [HOSTNAME]               : run server with hostname [HOSTNAME] 
@@ -20,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
@@ -32,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
+""",
+    "views": """# import packages from default or pip library
 from fastapi import APIRouter, Depends, status, HTTPException
 from typing_extensions import Annotated, Doc
 
@@ -47,11 +46,9 @@ 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
-from pydantic import BaseModel
+""",
+    "routers": """# import packages from default or pip library
+from pydantic import BaseModel, field_validator, ValidationError
 
 # import packages from this framework below
 
@@ -61,10 +58,14 @@ from pydantic import BaseModel
 
 # 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_ALREADY_EXIST_APP: str = """
+[WARNING] You already have app named '{}'.
 """
 
 # ERROR MSGs
@@ -74,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.
@@ -315,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
 
@@ -340,9 +345,15 @@ def help_msg():
     print(HELP_MSG)
     return None
 
-def run_server(options: list):
-    args = "".join([ option.replace("=", "") for option in options ])
-    print(f"uvicorn main:app {args}")
+def run_server(options: list, app_name: str = "main"):
+    for f in FOLDER_LIST:
+        if f not in os.listdir():
+            print(ERROR_MSG_IMPOSSIBLE_RUNSERVER_OUT_OF_PROJECT)
+            return None
+
+    args = " ".join([ option.replace("=", " ") for option in options ])
+    command = f"uvicorn {app_name}:app {args}"
+    result_cmd = subprocess.call(command, shell=True)
     return None
 
 def main() -> None:
@@ -359,7 +370,7 @@ def main() -> None:
             createapp(app_name=read_command[2])
             return None
 
-        elif sub_command == "run":
+        elif sub_command == "runserver":
             run_server(read_command[2:])
             return None
 

jknife/db/models/mongo/users.py

@@ -4,7 +4,7 @@ from typing_extensions import Annotated, Doc
 from mongoengine import Document, BooleanField, DateTimeField, IntField, StringField
 
 # import packages from this framework
-from src.jknife.db.models.rdbms.users import encrypt_password
+from ..rdbms.users import encrypt_password
 
 
 # define Class for Common SQLModel

jknife/views/users.py

@@ -4,8 +4,8 @@ from typing_extensions import Annotated, Doc
 from pydantic import BaseModel, field_validator
 
 # import packages from this framework
-from src.jknife.views.personnel_info import EmailInputViewMixin
-from src.jknife.dependencies.users import validate_password_policy
+from jknife.views.personnel_info import EmailInputViewMixin
+from jknife.dependencies.users import validate_password_policy
 
 
 # define mixin class

{jknife-0.0.8.dist-info → jknife-0.0.11.dist-info}/METADATA

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

{jknife-0.0.8.dist-info → jknife-0.0.11.dist-info}/RECORD

@@ -1,7 +1,7 @@
 jknife/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jknife/logging.py,sha256=vwXXYqiRDRSeAUtDZq6QTTJ5p7ES4iLdnS68Cz0MFgo,2312
 jknife/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jknife/commands/jknife.py,sha256=Uz1RPczM9WqPoH0PKNLuWpZdhRyjdIU51nTgXeeIWJQ,11757
+jknife/commands/jknife.py,sha256=ol0QKc1nz98dnZc7HcFypbbctfTFUbX_v1yyevJ-meE,12235
 jknife/db/__init__.py,sha256=lZQ1ds_BYK4Xkjaypn1zDxuypjdEKca-6uxSJ3mr0V4,6236
 jknife/db/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jknife/db/models/mongo/__init__.py,sha256=bDj6rFEtNudrbtPbk4iORlWwXyMv6V_PCeixyGufxP4,1984
@@ -9,7 +9,7 @@ jknife/db/models/mongo/network.py,sha256=MfFq05k_42uw4mMfcd62K7MOhuk0E5OuqfxmHD_
 jknife/db/models/mongo/personnel_info.py,sha256=wIalbvVI1bqCTOsShrSvy29I6OrdqaY6nYGhSxRFTf0,3273
 jknife/db/models/mongo/settings.py,sha256=mFJQAAeoyWEY1J6y5_l1p4JevOYHyX27wL5A-gO35bg,2219
 jknife/db/models/mongo/token.py,sha256=Xfw6LlAZ8Qu2iA9vYxyTk52aq4KoMLZ9P0KBRDiOBLI,2410
-jknife/db/models/mongo/users.py,sha256=xTlkK5BiF5oSaeFyF1aTh7JDpu2K6Jr0MI2ALt0BoSA,2931
+jknife/db/models/mongo/users.py,sha256=6YmUTnR-Ru-J2XotnJHifQKfIgktAVV27MQZMIvssKE,2912
 jknife/db/models/rdbms/__init__.py,sha256=0r22xz8J_kENMiPNVr_t3P5iILGXsll38wXXwnREABc,1847
 jknife/db/models/rdbms/network.py,sha256=lk3p4UBbsnPRuwr5Q4CGXDL9bSAlZAEaUz-GVfEWc0U,1040
 jknife/db/models/rdbms/personnel_info.py,sha256=OBwMvg8K_3XqKSSaeJzDir_pIIHNd3cxdL-2IsQFuFQ,2976
@@ -23,9 +23,9 @@ jknife/views/__init__.py,sha256=uXUiBzToN6gmb7zcHUyPbniNjCtzbyN31FrIVs7PpI0,596
 jknife/views/error_message.py,sha256=g3xS8Z0R1BeP9XpmETgLirDdghM789iGXBfU-K8wwWM,887
 jknife/views/personnel_info.py,sha256=JL_GqerZjhgs4AJQsQ2eeUZxCh17G8zXuWsDqaEI2tk,957
 jknife/views/tokens.py,sha256=PJh_fGEwK3T6Kq0aY-CuJPWCTdcHFrCSd2NhJMZqYqU,647
-jknife/views/users.py,sha256=ndbSTMlEeiwazfejHrGj37Jnw-e40Y6YoZwzyyyM4ns,2041
-jknife-0.0.8.dist-info/METADATA,sha256=eTsvfnEq40nBbG6pBf6JTxzowsKZkaX9Wysbl9SVYTw,528
-jknife-0.0.8.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-jknife-0.0.8.dist-info/entry_points.txt,sha256=08tkSuEw5jKr7Jz0cFlcKr8b2fjsQIf4Mzmb0cB8XOM,55
-jknife-0.0.8.dist-info/licenses/LICENSE,sha256=myY0xrsHJcytQadTeGVqmIo6QlskAAf5epHL-WRQe30,1067
-jknife-0.0.8.dist-info/RECORD,,
+jknife/views/users.py,sha256=mcljiLn9I0NL6jK_cxp8IdNXcyNwxYtfzkwW0NS64-E,2033
+jknife-0.0.11.dist-info/METADATA,sha256=GsWgkaoEPRqcmfxCUNAkkVeM7JdCW2yKKis7-pK36QA,529
+jknife-0.0.11.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+jknife-0.0.11.dist-info/entry_points.txt,sha256=08tkSuEw5jKr7Jz0cFlcKr8b2fjsQIf4Mzmb0cB8XOM,55
+jknife-0.0.11.dist-info/licenses/LICENSE,sha256=myY0xrsHJcytQadTeGVqmIo6QlskAAf5epHL-WRQe30,1067
+jknife-0.0.11.dist-info/RECORD,,