be4 es-connect split-dev-from-deploy

core/core.py

@@ -19,10 +19,10 @@ import httpx
 import json
 
 ### import from internal-file
-from utils.base_model import *
+from router.bale.base_model import *
-from utils.bale_buttons import *
+from router.bale.bale_buttons import *
-from utils.bale_massages import *
+from router.bale.bale_massages import *
-from utils.static import *
+from core.static import *
 
 
 ############## Global-Params

core/static.py

@@ -1,13 +1,13 @@
 ################# modularity
 ### import from external-package
-from fastapi import FastAPI, Request, HTTPException
+# from fastapi import FastAPI, Request, HTTPException
-import requests, logging, asyncio, httpx, os, uuid, traceback, orjson, copy, uvicorn, time, re
+# import requests, logging, asyncio, httpx, os, uuid, traceback, orjson, copy, uvicorn, time, re
-from dotenv import load_dotenv
+# from dotenv import load_dotenv
-from pathlib import Path
+# from pathlib import Path
-from time import sleep
+# from time import sleep
-from enum import Enum
+# from enum import Enum
-from typing import Dict
+# from typing import Dict
-from utils.base_model import RuleRelation
+# from utils.base_model import RuleRelation
 
 
 

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

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.bale import router as bale_router
-from router.bale_bot import initialize_webhook
+from router.bale.bale import initialize_webhook
-from utils.main import  BaleBot, UserManager
+from router.bale.bale_handle import  BaleBot, UserManager
 from dotenv import load_dotenv
 import os
 

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
 
 

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 router.bale.base_model import *
-from utils.bale_buttons import *
+from router.bale.bale_buttons import *
-from utils.bale_massages import *
+from router.bale.bale_massages import *
-from utils.workflow import *
+from core.core import *
-from utils.static import *
+from core.static import *
-from utils.config import STATE_CONFIG, STATE, BUSY_TEXT,MAIN_BUTTON, STATE_REGISTERY, build_buttons_form
+from router.bale.config import STATE_CONFIG, STATE, BUSY_TEXT,MAIN_BUTTON, STATE_REGISTERY, build_buttons_form
 from typing import Iterable, Any, List
 
 

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

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)