diff --git a/utils/workflow.py b/core/core.py similarity index 99% rename from utils/workflow.py rename to core/core.py index f50c4c8..603154f 100755 --- a/utils/workflow.py +++ b/core/core.py @@ -19,10 +19,10 @@ import httpx import json ### import from internal-file -from utils.base_model import * -from utils.bale_buttons import * -from utils.bale_massages import * -from utils.static import * +from router.bale.base_model import * +from router.bale.bale_buttons import * +from router.bale.bale_massages import * +from core.static import * ############## Global-Params diff --git a/utils/static.py b/core/static.py similarity index 72% rename from utils/static.py rename to core/static.py index b7317ba..f765b70 100755 --- a/utils/static.py +++ b/core/static.py @@ -1,13 +1,13 @@ ################# modularity ### import from external-package -from fastapi import FastAPI, Request, HTTPException -import requests, logging, asyncio, httpx, os, uuid, traceback, orjson, copy, uvicorn, time, re -from dotenv import load_dotenv -from pathlib import Path -from time import sleep -from enum import Enum -from typing import Dict -from utils.base_model import RuleRelation +# from fastapi import FastAPI, Request, HTTPException +# import requests, logging, asyncio, httpx, os, uuid, traceback, orjson, copy, uvicorn, time, re +# from dotenv import load_dotenv +# from pathlib import Path +# from time import sleep +# from enum import Enum +# from typing import Dict +# from utils.base_model import RuleRelation diff --git a/dependencies.py b/dependencies.py index 3ac1783..f3f9e1a 100755 --- a/dependencies.py +++ b/dependencies.py @@ -1,6 +1,6 @@ # dependencies.py from fastapi import Depends, Request -from utils.workflow import ElasticHelper +from core.core import ElasticHelper def _get_es_helper(request: Request) -> ElasticHelper: return request.app.state.es_helper diff --git a/app.py b/main.py similarity index 94% rename from app.py rename to main.py index ad1c842..28edb20 100755 --- a/app.py +++ b/main.py @@ -1,11 +1,11 @@ # app.py from fastapi import FastAPI from contextlib import asynccontextmanager -from utils.workflow import ElasticHelper, Formatter, RequestManager +from core.core import ElasticHelper, Formatter, RequestManager from fastapi.middleware.cors import CORSMiddleware -from router.bale_bot import router as bale_router -from router.bale_bot import initialize_webhook -from utils.main import BaleBot, UserManager +from router.bale.bale import router as bale_router +from router.bale.bale import initialize_webhook +from router.bale.bale_handle import BaleBot, UserManager from dotenv import load_dotenv import os diff --git a/router/bale_bot.py b/router/bale/bale.py similarity index 95% rename from router/bale_bot.py rename to router/bale/bale.py index fa61442..2f4a2cc 100755 --- a/router/bale_bot.py +++ b/router/bale/bale.py @@ -1,7 +1,7 @@ # router.bale_bot.py from fastapi import Depends, APIRouter, Request import requests, traceback -from utils.main import BaleBot, BaleUpdate +from router.bale.bale_handle import BaleBot, BaleUpdate from dependencies import _get_bale_token, _get_bale_bot diff --git a/utils/bale_buttons.py b/router/bale/bale_buttons.py similarity index 100% rename from utils/bale_buttons.py rename to router/bale/bale_buttons.py diff --git a/utils/main.py b/router/bale/bale_handle.py similarity index 99% rename from utils/main.py rename to router/bale/bale_handle.py index d1f9663..110017d 100755 --- a/utils/main.py +++ b/router/bale/bale_handle.py @@ -11,12 +11,12 @@ from typing import Dict, Optional from dataclasses import dataclass ### import from internal-file -from utils.base_model import * -from utils.bale_buttons import * -from utils.bale_massages import * -from utils.workflow import * -from utils.static import * -from utils.config import STATE_CONFIG, STATE, BUSY_TEXT,MAIN_BUTTON, STATE_REGISTERY, build_buttons_form +from router.bale.base_model import * +from router.bale.bale_buttons import * +from router.bale.bale_massages import * +from core.core import * +from core.static import * +from router.bale.config import STATE_CONFIG, STATE, BUSY_TEXT,MAIN_BUTTON, STATE_REGISTERY, build_buttons_form from typing import Iterable, Any, List diff --git a/utils/bale_massages.py b/router/bale/bale_massages.py similarity index 100% rename from utils/bale_massages.py rename to router/bale/bale_massages.py diff --git a/utils/base_model.py b/router/bale/base_model.py similarity index 99% rename from utils/base_model.py rename to router/bale/base_model.py index 3e6be1e..a11a1b2 100755 --- a/utils/base_model.py +++ b/router/bale/base_model.py @@ -1,6 +1,6 @@ from pydantic import BaseModel, Field from typing import List, Optional, Literal, Union, Dict, Any -from utils.bale_buttons import BUTTON_TEXT_TO_CALLBACK_LIST +from router.bale.bale_buttons import BUTTON_TEXT_TO_CALLBACK_LIST import json from typing import Optional, Callable, List, Any from pydantic import BaseModel diff --git a/utils/config.py b/router/bale/config.py similarity index 99% rename from utils/config.py rename to router/bale/config.py index ac0c7d6..ddce9fc 100644 --- a/utils/config.py +++ b/router/bale/config.py @@ -1,4 +1,4 @@ -from utils.base_model import StateDetail +from router.bale.base_model import StateDetail @@ -135,12 +135,12 @@ main_button_form = [ ["search_in_law"], ["chat_in_law"], ["logical_chat_in_law"], + ["rule_making"], ["conflict_law_writing_policy"], ["conflict_qanon_asasi"], ["conflict_general_policy"], ["conflict_all_qavanin"], ["qanon_title_repeat"], - ["rule_making"], ["contact_us", "about_us", "beta"] ] MAIN_BUTTON = build_buttons_form(main_button_form) \ No newline at end of file