kunapi 1.2__tar.gz → 1.4__tar.gz

{kunapi-1.2 → kunapi-1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kunapi
-Version: 1.2
+Version: 1.4
 Summary: kunapi
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fengkun01@qq.com
 License: MIT License
 Description: kunapi
-Keywords: kunapi1.2
+Keywords: kunapi1.4
 Platform: UNKNOWN

{kunapi-1.2 → kunapi-1.4}/kunapi/Events.py

@@ -53,7 +53,6 @@ class Events:
         self.process = subprocess.Popen(self.command)
     def restart_process(self):
         "重启"
-        
         self.kill_process()
         time.sleep(0.1)
         self.start_process()

{kunapi-1.2 → kunapi-1.4}/kunapi/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = '1.2'
+__version__ = '1.4'
 try:
     from .app import web
 except:pass

{kunapi-1.2 → kunapi-1.4}/kunapi/app.py

@@ -12,7 +12,6 @@ class web:
         self.__name=name
         self.__appname=appname
         if self.__name == '__main__' or self.__name=='kunapi.kunapi' or self.__name=='kwebs.kwebs' or self.__name=='kwebsp.kwebsp':
-            # print("web__new__",self.__name)
             return super().__new__(self)
         else:
             def apps(env, start_response):
@@ -79,7 +78,6 @@ class web:
                         pass
                     else:
                         body=bytes(body, encoding='utf-8')
-                # print(env)
                 start_response(status,resheader)
                 return [body]
             return apps
@@ -104,19 +102,18 @@ class web:
             # config.app['cli']=False
             if 'kwebsp' in cmd[0]: #基于新版本4.13.32之后 kwebsp server运行
                 cmd[0]='kwebsp'
-                filename=cmd[0]
+                # filename=cmd[0]
             elif 'kwebs' in cmd[0]: #基于新版本4.13.32之后 kwebs server运行
                 cmd[0]='kwebs'
-                filename=cmd[0]
+                # filename=cmd[0]
             elif 'kunapi' in cmd[0]:
                 cmd[0]='kunapi'
-                filename=cmd[0]
-            else: #基于老版本4.13.32之前 python server.py运行
-                filename=cmd[0][:-3]
-            # self.__filename=filename
+            #     filename=cmd[0]
+            # else:
+            #     filename=cmd[0][:-3]
             if self.__config.app['app_debug']:
                 if 'eventlog' in cmd:
-                    self.__impl(host=host,port=port,filename=filename)
+                    self.__impl(host=host,port=port)
                 else:
                     if name:
                         cmd.insert(0,name)
@@ -124,10 +121,10 @@ class web:
                     from . Events import Events
                     Events(cmd)
             else:
-                self.__impl(host=host,port=port,filename=filename)
-        elif len(sys.argv)==3 and sys.argv[2]=='--cli':
+                self.__impl(host=host,port=port)
+        elif len(cmd)==3 and cmd[2]=='--cli':
             try:
-                RAW_URI=sys.argv[1]
+                RAW_URI=cmd[1]
             except:pass
             else:
                 self.cli(RAW_URI)
@@ -161,41 +158,22 @@ class web:
         status,resheader,body=self.__routes(reqheader)
         print(body)
         if(config.app['save_cli_pid']) and pid:
-
             try:
                 os.remove(clipidpath)
             except:pass
-    def __impl(self,host,port,filename):
+    def __impl(self,host,port):
         "运行测试服务器"
         try:
-            # if config.app['http_server']=='wsgiref':
-            #     self.__http_wsgi( 
-            #         host=host,
-            #         port=port,
-            #         filename=filename
-            #     )
-            # elif config.app['http_server']=='kwebs':
-            #     self.__http_sever(
-            #         host=host,
-            #         port=port,
-            #         filename=filename
-            #     )
-            # elif config.app['http_server']=='kwebs_server':
-            #     self.__http_server(
-            #         host=host,
-            #         port=port,
-            #         filename=filename
-            #     )
-            # else:
-            #     self.__http_wsgi(
-            #         host=host,
-            #         port=port,
-            #         filename=filename
-            #     )
-            self.__http_wsgi(
+
+            # self.__http_wsgi(
+            #     host=host,
+            #     port=port,
+            #     filename=filename
+            # )
+
+            self.__waitress(
                 host=host,
-                port=port,
-                filename=filename
+                port=port
             )
         except KeyboardInterrupt:
             pass
@@ -333,7 +311,6 @@ class web:
         # elif route['plug']:  #配置模块但没有匹配插件
         #     plug=route['plug']
         elif getplug:
-            # print('getplug',getplug)
             plug=getplug
             routedefault,PATH_INFO=web.__getconfigroute(
                 self,
@@ -356,7 +333,6 @@ class web:
                             param.append(urllib.parse.unquote(path))
                     i+=1
         else: #完全默认
-            # print('完全默认')
             routedefault,PATH_INFO=web.__getconfigroute(self,PATH_INFO,header)
             if routedefault: #使用默认路由
                 for path in PATH_INFO:
@@ -550,7 +526,6 @@ class web:
                                             status="500 Internal Server Error"
                                             errms=status
                                             if self.__config.app['app_debug']:
-                                                # print(traceback.format_exc())
                                                 errms=traceback.format_exc().split("\n")
                                             body=web.__tpl(
                                                 title = status,
@@ -696,11 +671,14 @@ class web:
     #     headers={"Content-Type":"application/json; charset=utf-8","Access-Control-Allow-Origin":"*"}
     #     return arr,'500 error',headers
     def __application(self,env, start_response):
-        # print(env)
         try:
             request_body_size = int(env.get('CONTENT_LENGTH', '0'))
         except (ValueError):
             request_body_size = 0
+        try:
+            env['CONTENT_TYPE']
+        except (KeyError):
+            env['CONTENT_TYPE'] = ''
         if 'multipart/form-data; boundary' in env['CONTENT_TYPE']:#上传文件
             files = cgi.FieldStorage(fp=env['wsgi.input'], environ=env, keep_blank_values=True)
             # open(form["file"].filename, 'wb').write(form["file"].value) 
@@ -715,39 +693,39 @@ class web:
         env['RAW_URI']=env['PATH_INFO']
         if env.get('QUERY_STRING'):
             env['RAW_URI']=str(env['PATH_INFO'])+"?"+str(env.get('QUERY_STRING'))
-        try:
-            env['REMOTE_ADDR']
-        except:
-            env['REMOTE_ADDR']=''
-        try:
-            env['wsgi.url_scheme']
-        except:
-            env['wsgi.url_scheme']=''
-        try:
-            env['HTTP_X_REAL_IP']
-        except:
-            env['HTTP_X_REAL_IP']=''
-        try:
-            env['HTTP_COOKIE']
-        except:
-            env['HTTP_COOKIE']=''
-        try:
-            env['HTTP_USER_AGENT']
-        except:
-            env['HTTP_USER_AGENT']=''
+        # try:
+        #     env['REMOTE_ADDR']
+        # except:
+        #     env['REMOTE_ADDR']=''
+        # try:
+        #     env['wsgi.url_scheme']
+        # except:
+        #     env['wsgi.url_scheme']=''
+        # try:
+        #     env['HTTP_X_REAL_IP']
+        # except:
+        #     env['HTTP_X_REAL_IP']=''
+        # try:
+        #     env['HTTP_COOKIE']
+        # except:
+        #     env['HTTP_COOKIE']=''
+        # try:
+        #     env['HTTP_USER_AGENT']
+        # except:
+        #     env['HTTP_USER_AGENT']=''
         reqheader={ 
-            'REQUEST_METHOD':env['REQUEST_METHOD'],
-            'url_scheme':env['wsgi.url_scheme'],
-            'RAW_URI':env['RAW_URI'],
-            'PATH_INFO':env['PATH_INFO'],
-            'QUERY_STRING':env['QUERY_STRING'],
-            'SERVER_PROTOCOL':env['SERVER_PROTOCOL'],
-            'HTTP_HOST':env['HTTP_HOST'],
-            'HTTP_COOKIE':env['HTTP_COOKIE'],
-            'REMOTE_ADDR':env['REMOTE_ADDR'],
-            'HTTP_USER_AGENT':env['HTTP_USER_AGENT'],
-            'BODY_DATA':env['BODY_DATA'],
-            'HTTP_X_REAL_IP':env['HTTP_X_REAL_IP'],
+            'REQUEST_METHOD':env.get('REQUEST_METHOD'),
+            'url_scheme':env.get('wsgi.url_scheme'),
+            'RAW_URI':env.get('RAW_URI'),
+            'PATH_INFO':env.get('PATH_INFO'),
+            'QUERY_STRING':env.get('QUERY_STRING'),
+            'SERVER_PROTOCOL':env.get('SERVER_PROTOCOL'),
+            'HTTP_HOST':env.get('HTTP_HOST'),
+            'HTTP_COOKIE':env.get('HTTP_COOKIE'),
+            'REMOTE_ADDR':env.get('REMOTE_ADDR'),
+            'HTTP_USER_AGENT':env.get('HTTP_USER_AGENT'),
+            'BODY_DATA':env.get('BODY_DATA'),
+            'HTTP_X_REAL_IP':env.get('HTTP_X_REAL_IP'),
             'files':files
         }
         p=(config.app['staticpath']+reqheader['RAW_URI'].replace(' ',''))
@@ -791,9 +769,19 @@ class web:
                 body=bytes(body, encoding='utf-8')
         start_response(status,resheader)
         return [body]
-    
+    def __waitress(self,host,port):
+        if host=='0.0.0.0':
+            print("\033[32m* （CTRL+单击打开）http://127.0.0.1:"+str(port)+"（按CTRL+C退出）")
+        else:
+            print("\033[32m* 运行在http://"+host+":"+str(port)+"（按CTRL+C退出）")
+        if self.__config.app['app_debug']:
+            print('\033[37m* 调试器：开启')
+        else:
+            print('\033[37m* 调试器：已关闭')
+        from waitress import serve
+        serve(self.__application, host=host, port=port)
     def __http_wsgi(self,host,port,filename):
-        "http——wsgi测试服务"
+        "http——wsgi测试服务 windows建议使用Waitress‌"
         from wsgiref.simple_server import make_server
         print("* \033[1;31;40m! 警告：\033[0m这是一个wsgiref开发服务器。不要在生产环境中部署使用它")
         # print('* 生产环境中建议使用gunicorn,gunicorn运行命令如：gunicorn -b '+host+':'+str(port)+' '+str(filename)+':app')

{kunapi-1.2 → kunapi-1.4}/kunapi/kunapi.py

@@ -164,35 +164,9 @@ def cllfunction():
             print("\033[32m"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" --modular api --uninstall                  卸载app/api模块")
             print("\033[32m"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" --modular api --plug plug1 --uninstall     卸载app/api/plug1插件\n")
     else:
-        if cmd_par['cli']:#通过命令行执行控制器的方法
-            try:
-                obj=importlib.import_module(cmd_par['appname']+'.common')
-                if obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr!=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1:
-                    print("该项目只能使用"+obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr+"开头的命令!")
-                    exit()
-            except Exception as e:
-                print('项目不合法',traceback.format_exc())
-                exit()
-            config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1
-            from kunapi import web
-            try:
-                import app as application
-            except Exception as e:
-                if "No module named 'app'" in str(e):
-                    print("请在"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"项目下运行")
-                else:
-                    print(traceback.format_exc())
-                exit()
-            else:
-                app=web(__name__,application)
-                try:
-                    RAW_URI=sys.argv[1]
-                except:pass
-                else:
-                    if RAW_URI=='--cli':
-                        RAW_URI=''
-                    app.cli(RAW_URI)
-        elif cmd_par['update']:#更新kunapi包:
+        
+        
+        if cmd_par['update']:#更新kunapi包:
             # print(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1)
             # exit()
             serall=['kunapi','kwebs','kwebsp']
@@ -252,7 +226,6 @@ def cllfunction():
                 if bs==fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1:
                     break
         elif cmd_par['server']:#启动web服务
-            
             try:
                 obj=importlib.import_module(cmd_par['appname']+'.common')
                 if obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr!=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1:
@@ -263,7 +236,27 @@ def cllfunction():
                 exit()
             config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1
             types=sys.argv[len(sys.argv)-1]
-            if get_sysinfo()['uname'][0]=='Linux':
+            if True:# os.name == 'nt':
+                from kunapi import web
+                try:
+                    import app as application
+                except Exception as e:
+                    if "No module named 'app'" in str(e):
+                        print("请在"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"项目下运行")
+                    else:
+                        print(traceback.format_exc())
+                    exit()
+                else:
+                    app=web(__name__,application)
+                    if __name__ == 'kunapi.kunapi':
+                        tar=len(sys.argv)
+                        kill_route_cli('pid/'+str(sys.argv[tar-1])+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+'_server_pid')
+                        if types=='-stop':
+                            pass
+                        else:
+                            save_route_cli_pid('pid/'+str(sys.argv[tar-1])+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+'_server_pid')
+                            app.run(host=cmd_par['host'],port=int(cmd_par['port']))
+            else:
                 pythonpath=site.getsitepackages()[0].replace('\\','/')
                 t=pythonpath.split('/')
                 tt='/'+t[-3]+'/'+t[-2]+'/'+t[-1]
@@ -299,27 +292,8 @@ def cllfunction():
                         sys.argv=[sys.argv[0], '-w', str(cmd_par['processcount']), '-b', cmd_par['host']+':'+str(cmd_par['port']),'-t',cmd_par['timeout'], 'server:'+cmd_par['appname']]
                         sys.exit(run())
                         exit()
-            else:
-                from kunapi import web
-                try:
-                    import app as application
-                except Exception as e:
-                    if "No module named 'app'" in str(e):
-                        print("请在"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"项目下运行")
-                    else:
-                        print(traceback.format_exc())
-                    exit()
-                else:
-                    app=web(__name__,application)
-                    if __name__ == 'kunapi.kunapi':
-                        tar=len(sys.argv)
-                        kill_route_cli('pid/'+str(sys.argv[tar-1])+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+'_server_pid')
-                        if types=='-stop':
-                            pass
-                        else:
-                            save_route_cli_pid('pid/'+str(sys.argv[tar-1])+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+'_server_pid')
-                            app.run(host=cmd_par['host'],port=int(cmd_par['port']))
-        else:
+             
+        elif cmd_par['install'] or cmd_par['pack'] or cmd_par['upload'] or cmd_par['uninstall']:
             if cmd_par['install']:#插入 应用、模块、插件
                 if cmd_par['appname'] and cmd_par['modular']:
                     if os.path.exists(cmd_par['appname']):
@@ -420,6 +394,62 @@ def cllfunction():
                 else:
                     print("\033[1;31;40m卸载时 必须指定应该app和modular，参考命令： "+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+" --app app --modular api")
                     exit()
+        elif cmd_par['cli']:#通过命令行执行控制器的方法
+            try:
+                obj=importlib.import_module(cmd_par['appname']+'.common')
+                if obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr!=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1:
+                    print("该项目只能使用"+obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr+"开头的命令!")
+                    exit()
+            except Exception as e:
+                print('项目不合法',traceback.format_exc())
+                exit()
+            config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1
+            from kunapi import web
+            try:
+                import app as application
+            except Exception as e:
+                if "No module named 'app'" in str(e):
+                    print("请在"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"项目下运行")
+                else:
+                    print(traceback.format_exc())
+                exit()
+            else:
+                app=web(__name__,application)
+                try:
+                    RAW_URI=sys.argv[1]
+                except:pass
+                else:
+                    if RAW_URI=='--cli':
+                        RAW_URI=''
+                    app.cli(RAW_URI)
+        else:#通过命令行执行控制器的方法
+            try:
+                obj=importlib.import_module(cmd_par['appname']+'.common')
+                if obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr!=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1:
+                    print("该项目只能使用"+obj.config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr+"开头的命令!")
+                    exit()
+            except Exception as e:
+                print('项目不合法',traceback.format_exc())
+                exit()
+            config.fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr=fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1
+            from kunapi import web
+            try:
+                import app as application
+            except Exception as e:
+                if "No module named 'app'" in str(e):
+                    print("请在"+fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1+"项目下运行")
+                else:
+                    print(traceback.format_exc())
+                exit()
+            else:
+                app=web(__name__,application)
+                try:
+                    RAW_URI=sys.argv[1]
+                except:pass
+                else:
+                    if RAW_URI=='--cli':
+                        RAW_URI=''
+                    app.cli(RAW_URI)
 def cill_start(fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr='kunapi'):
     "脚本入口"
     global fdgrsgrsegsrsgrsbsdbftbrsbfdrtrtbdfsrsgr1

{kunapi-1.2 → kunapi-1.4}/kunapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: kunapi
-Version: 1.2
+Version: 1.4
 Summary: kunapi
 Home-page: https://docs.kwebapp.cn/index/index/2
 Author: 百里-坤坤
@@ -9,5 +9,5 @@ Maintainer: 坤坤
 Maintainer-email: fengkun01@qq.com
 License: MIT License
 Description: kunapi
-Keywords: kunapi1.2
+Keywords: kunapi1.4
 Platform: UNKNOWN

{kunapi-1.2 → kunapi-1.4}/kunapi.egg-info/SOURCES.txt

@@ -30,4 +30,26 @@ kunapi/tempfile/kunapi/app/index/controller/index/__init__.py
 kunapi/tempfile/kunapi/app/index/controller/index/index.py
 kunapi/tempfile/kunapi/app/index/controller/index/common/__init__.py
 kunapi/tempfile/kunapi/app/index/controller/index/common/autoload.py
+kunapi/tempfile/kunapi/app/index/controller/index/common/model.py
+kunapi/common/__init__.py
+kunapi/common/autoload.py
+kunapi/common/globals.py
+kunapi/common/request.py
+kunapi/config/__init__.py
+kunapi/tempfile/__init__.py
+kunapi/tempfile/kunapi/server.py
+kunapi/tempfile/kunapi/app/__init__.py
+kunapi/tempfile/kunapi/app/common/__init__.py
+kunapi/tempfile/kunapi/app/common/autoload.py
+kunapi/tempfile/kunapi/app/common/model.py
+kunapi/tempfile/kunapi/app/config/__init__.py
+kunapi/tempfile/kunapi/app/config/app.py
+kunapi/tempfile/kunapi/app/index/__init__.py
+kunapi/tempfile/kunapi/app/index/common/__init__.py
+kunapi/tempfile/kunapi/app/index/common/autoload.py
+kunapi/tempfile/kunapi/app/index/controller/__init__.py
+kunapi/tempfile/kunapi/app/index/controller/index/__init__.py
+kunapi/tempfile/kunapi/app/index/controller/index/index.py
+kunapi/tempfile/kunapi/app/index/controller/index/common/__init__.py
+kunapi/tempfile/kunapi/app/index/controller/index/common/autoload.py
 kunapi/tempfile/kunapi/app/index/controller/index/common/model.py

{kunapi-1.2 → kunapi-1.4}/kunapi.egg-info/requires.txt

@@ -1,4 +1,5 @@
 gunicorn==20.0.4
+waitress==3.0.0
 watchdog==4.0.0
 filetype==1.2.0
 psutil==5.8.0

{kunapi-1.2 → kunapi-1.4}/setup.py

@@ -31,7 +31,7 @@ def start():
         maintainer_email = kcwsinfo["maintainer_email"],
         url=kcwsinfo['url'],
         packages =  b,
-        install_requires = ['gunicorn==20.0.4','watchdog==4.0.0','filetype==1.2.0','psutil==5.8.0','requests==2.32.4'], #第三方包
+        install_requires = ['gunicorn==20.0.4','waitress==3.0.0','watchdog==4.0.0','filetype==1.2.0','psutil==5.8.0','requests==2.32.4'], #第三方包
         package_data = {
             '': ['*.html', '*.js','*.css','*.jpg','*.png','*.gif'],
         },