diff --git a/app/sage.py b/app/sage.py index d32d15d..12e1dfc 100644 --- a/app/sage.py +++ b/app/sage.py @@ -4,11 +4,12 @@ from appPublic.log import MyLogger, info, debug, warning from appPublic.folderUtils import ProgramPath from appPublic.jsonConfig import getConfig from appPublic.registerfunction import RegisterFunction -from ahserver.configuredServer import ConfiguredServer +from bricks_for_python.init import load_pybricks +from ahserver.webapp import webapp from ahserver.serverenv import ServerEnv from rbac.init import load_rbac from appbase.init import load_appbase -from basellm.init import load_basellm +from llmage.init import load_llmage from filemgr.init import load_filemgr from uapi.init import load_uapi @@ -20,35 +21,19 @@ from ext import * from rf import * __version__ = '0.0.1' -if __name__ == '__main__': - parser = argparse.ArgumentParser(prog="Sage") - parser.add_argument('-w', '--workdir') - parser.add_argument('-p', '--port') - args = parser.parse_args() - workdir = args.workdir or os.getcwd() - p = ProgramPath() - config = getConfig(workdir, NS={'workdir':workdir, 'ProgramPath':p}) - if config.logger: - logger = MyLogger(config.logger.name or 'sage', - levelname=config.logger.levelname or 'debug', - logfile=config.logger.logfile or None) - else: - logger = MyLogger('sage', levelname='debug') - - info(f'====================sage version={__version__}') - # server = ConfiguredServer(auth_klass=MyAuthAPI, workdir=workdir) - server = ConfiguredServer(workdir=workdir) +def init(): rf = RegisterFunction() set_globalvariable() + load_pybricks() load_appbase() load_rbac() load_accounting() load_pf_pay() load_platformbiz() - load_basellm() + load_llmage() load_filemgr() load_uapi() - port = args.port or config.website.port or 8080 - port = int(port) - server.run(port=port) + +if __name__ == '__main__': + webapp(init) diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..76460be --- /dev/null +++ b/build.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env bash +# clone from git@git.opencomputing.cn/yumoqing/sage +# git clone https://git.opencomputing.cn/yumoqing/sage +cdir=$(pwd) +uname=$(id -un) +gname=$(id -gn) +python3 -m venv py3 +source py3/bin/activate +$cdir/py3/bin/pip install -r requirements.txt +mkdir pkgs +cd pkgs +dir=$(pwd) +for m in appbase rbac accounting llmage platformbiz pf_pay filemgr dapi uapi +do + echo "install $m module..." + cd $dir + git clone https://git.opencomputing.cn/yumoqing/$m + cd $dir/$m + $cdir/py3/bin/pip install . + cd $dir/$m/models + xls2ddl mysql . > mysql.ddl.sql + mysql -h db -utest -ptest123 sage < mysql.ddl.sql + cd $dir/$m/json + ./build.sh + rm $cdir/wwwroot/$m + ln -s $dir/$m/wwwroot $cdir/wwwroot/$m +done +rm $cdir/wwwroot/bricks +ln -s /d/public/bricks $cdir/wwwroot +cd $cdir +cat > $cdir/sage.service < $cdir/start.sh < $cdir/stop.sh <