jknife 0.0.7__py2.py3-none-any.whl → 0.0.10__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] 
@@ -51,7 +52,7 @@ router = APIRouter(prefix="/{}",
 
 # Template for views/APP_NAME.py
 MODULE_IMPORT_STRING_VIEWS: str = """# import packages from default or pip library
-from pydantic import BaseModel
+from pydantic import BaseModel, field_validator, ValidationError
 
 # import packages from this framework below
 
@@ -66,6 +67,9 @@ from pydantic import BaseModel
 WARN_MSG_ALREADY_EXIST_PROJECT: str = """
 [WARNING] You already have project '{}'.
 """
+WARN_MSG_IMPOSSIBLE_RUNSERVER_OUT_OF_PROJECT: str = """
+[WARNING] You have to execute 'runserver' command in your project folder.
+"""
 
 # ERROR MSGs
 ERROR_MSG_START_PROJECT: str = """
@@ -272,13 +276,12 @@ async def validation_error(req: Request, exc: RequestValidationError):
 
 
 # add routers_bak
-for router in os.listdir(os.path.abspath(path="routers_bak")):
+for router in os.listdir(os.path.abspath(path="routers")):
     if not router.startswith("__"):
-        tmp_module = importlib.import_module(name=f"routers_bak.{router.split('.')[0]}")
+        tmp_module = importlib.import_module(name=f"routers.{router.split('.')[0]}")
         app.include_router(router=tmp_module.router,
                            prefix=MAIN_URL)
 
-
 """
 
 
@@ -341,9 +344,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(WARN_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:
@@ -360,7 +369,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.7.dist-info → jknife-0.0.10.dist-info}/METADATA

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

{jknife-0.0.7.dist-info → jknife-0.0.10.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=d0vu7kfR8uVNmq64duXZzCz2xFd82csV2lH3vEjRFDw,11766
+jknife/commands/jknife.py,sha256=BiVaxK5x0E8F3uWTl1cCjiHj7K7TGmXkyE0l9FZiJi4,12193
 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.7.dist-info/METADATA,sha256=jBNrcy7747722_JjkwO9mC_mNdL3SU9hlmPX4QYcwb4,528
-jknife-0.0.7.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-jknife-0.0.7.dist-info/entry_points.txt,sha256=08tkSuEw5jKr7Jz0cFlcKr8b2fjsQIf4Mzmb0cB8XOM,55
-jknife-0.0.7.dist-info/licenses/LICENSE,sha256=myY0xrsHJcytQadTeGVqmIo6QlskAAf5epHL-WRQe30,1067
-jknife-0.0.7.dist-info/RECORD,,
+jknife/views/users.py,sha256=mcljiLn9I0NL6jK_cxp8IdNXcyNwxYtfzkwW0NS64-E,2033
+jknife-0.0.10.dist-info/METADATA,sha256=0fTSIE4iA9t5tj6iKCv17PocEp2jJaAM46AQQkj9w-c,529
+jknife-0.0.10.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+jknife-0.0.10.dist-info/entry_points.txt,sha256=08tkSuEw5jKr7Jz0cFlcKr8b2fjsQIf4Mzmb0cB8XOM,55
+jknife-0.0.10.dist-info/licenses/LICENSE,sha256=myY0xrsHJcytQadTeGVqmIo6QlskAAf5epHL-WRQe30,1067
+jknife-0.0.10.dist-info/RECORD,,