Merge branch 'feature-refactor' into 'develop'

refactor: 重构代码降低重复率

See merge request bge/bge-python-sdk!2

Author: zhanglei3

bgesdk/management/commands/model.py

@@ -469,59 +469,21 @@ def _save_model_config(self, model_id, runtime, memory_size, timeout, home=None)
         output('解读模型配置已保存至：{}'.format(config_path))
 
     def _install_sdk(self):
-        home = get_home()
         config_path = self.get_model_config_path()
         config = get_config_parser(config_path)
         section_name = DEFAULT_MODEL_SECTION
         model_id = config_get(config.get, section_name, 'model_id')
         runtime = config_get(config.get, section_name, 'runtime')
-        image_name = RUNTIMES[runtime]
-        container_name = generate_container_name(model_id)
-        command = WHEREIS_DOCKER if SYS_STR == 'windows' else WHICH_DOCKER
-        with os.popen(command) as f:
-            docker_path = f.read()
-        if not docker_path:
-            output(INSTALL_DOCKER_MESSAGE)
-            sys.exit(1)
         client = self._get_docker_client()
         command = ('pip install --no-deps bge-python-sdk pimento '
                    'requests_toolbelt -t /code/lib')
-        try:
-            client.images.get(image_name)
-        except docker.errors.NotFound:
-            pull_image(image_name)
+        image_name = RUNTIMES[runtime]
+        self._get_or_pull_image(client, image_name)
         output('开始安装模型依赖包...')
         command = ('sh -c "{}"').format(command)
-        user = get_sys_user()
-        try:
-            container = client.containers.get(container_name)
-            if container.status != 'exited':
-                try:
-                    container.remove(force=True)
-                except Exception:
-                    pass
-        except docker.errors.NotFound:
-            pass
-        container = client.containers.run(
-            image_name,
-            command=command,
-            name=container_name,
-            volumes={home: { 'bind': WORKDIR, 'mode': 'rw' }},
-            stop_signal='SIGINT',
-            user=user,
-            detach=True,
-            auto_remove=True)
-        try:
-            logs = container.logs(stream=True)
-            for log in logs:
-                sys.stdout.write(log.decode('utf-8'))
-                sys.stdout.flush()
-        finally:
-            if container.status != 'exited':
-                try:
-                    container.remove(force=True)
-                except Exception:
-                    pass
+        container_name = generate_container_name(model_id)
+        self._force_remove_container(client, container_name)
+        self._run_by_container(client, image_name, command, container_name)
         output('安装完成')
 
     def upload_model_expfs(self, args):
@@ -857,60 +819,64 @@ def install_deps(self, args):
         upgrade = args.upgrade
         force_reinstall = args.force_reinstall
         pkgs = ' '.join(package_name)
-        home = get_home()
         config_path = self.get_model_config_path()
         config = get_config_parser(config_path)
         section_name = DEFAULT_MODEL_SECTION
         model_id = config_get(config.get, section_name, 'model_id')
         runtime = config_get(config.get, section_name, 'runtime')
-        image_name = RUNTIMES[runtime]
-        container_name = generate_container_name(model_id)
-        deps = []
-        if pkgs:
-            deps.append(pkgs)
-        if requirements:
-            deps.append('-r {}'.format(requirements))
-        command = WHEREIS_DOCKER if SYS_STR == 'windows' else WHICH_DOCKER
-        with os.popen(command) as f:
-            docker_path = f.read()
-        if not docker_path:
-            output(INSTALL_DOCKER_MESSAGE)
-            sys.exit(1)
         client = self._get_docker_client()
         command = ['pip install']
         if upgrade:
             command.append('--upgrade')
         if force_reinstall:
             command.append('--force-reinstall')
+        deps = []
+        if pkgs:
+            deps.append(pkgs)
+        if requirements:
+            deps.append('-r {}'.format(requirements))
         command.append('-t /code/lib {}'.format(' '.join(deps)))
         command = ' '.join(command)
-        try:
-            client.images.get(image_name)
-        except docker.errors.NotFound:
-            pull_image(image_name)
+        image_name = RUNTIMES[runtime]
+        self._get_or_pull_image(client, image_name)
         output('开始安装模型依赖包...')
         command = ('sh -c "{}"').format(command)
+        container_name = generate_container_name(model_id)
+        self._force_remove_container(client, container_name)
+        self._run_by_container(client, image_name, command, container_name)
+        output('安装完成')
+
+    def start_model(self, args):
+        output('Model debug server is starting ...')
+        home = get_home()
+        config_path = self.get_model_config_path()
+        config = get_config_parser(config_path)
+        section_name = DEFAULT_MODEL_SECTION
+        model_id = config_get(config.get, section_name, 'model_id')
+        runtime = config_get(config.get, section_name, 'runtime')
+        client = self._get_docker_client()
+        image_name = RUNTIMES[runtime]
+        self._get_or_pull_image(client, image_name)
+        command = 'python -u /server/app.py'
         user = get_sys_user()
-        try:
-            container = client.containers.get(container_name)
-            if container.status != 'exited':
-                try:
-                    container.remove(force=True)
-                except Exception:
-                    pass
-        except docker.errors.NotFound:
-            pass
+        container_name = generate_container_name(model_id)
+        self._force_remove_container(client, container_name)
         container = client.containers.run(
             image_name,
             command=command,
             name=container_name,
             volumes={home: { 'bind': WORKDIR, 'mode': 'rw' }},
             stop_signal='SIGINT',
+            ports={TEST_SERVER_PORT: TEST_SERVER_PORT},
             user=user,
             detach=True,
+            stream=True,
             auto_remove=True)
+        output('Model {} was registered'.format(model_id))
+        output('\n\tURL: {}/model/{}'.format(TEST_SERVER_ENDPOINT, model_id))
+        output('\tMethod: GET\n')
         try:
-            logs = container.logs(stream=True)
+            logs = container.logs(stream=True, follow=True)
             for log in logs:
                 sys.stdout.write(log.decode('utf-8'))
                 sys.stdout.flush()
@@ -920,31 +886,34 @@ def install_deps(self, args):
                     container.remove(force=True)
                 except Exception:
                     pass
-        output('安装完成')
 
-    def start_model(self, args):
-        output('Model debug server is starting ...')
-        home = get_home()
-        config_path = self.get_model_config_path()
-        config = get_config_parser(config_path)
-        section_name = DEFAULT_MODEL_SECTION
-        model_id = config_get(config.get, section_name, 'model_id')
-        runtime = config_get(config.get, section_name, 'runtime')
-        image_name = RUNTIMES[runtime]
-        container_name = generate_container_name(model_id)
+    def _get_docker_client(self):
         command = WHEREIS_DOCKER if SYS_STR == 'windows' else WHICH_DOCKER
         with os.popen(command) as f:
             docker_path = f.read()
         if not docker_path:
             output(INSTALL_DOCKER_MESSAGE)
             sys.exit(1)
-        client = self._get_docker_client()
+        try:
+            client = docker.from_env()
+        except docker.errors.DockerException:
+            output('请确认 docker 服务是否已开启。')
+            output('启动命令：/etc/init.d/docker start')
+            sys.exit(1)
+        return client
+
+    def _get_or_pull_image(self, client, image_name):
         try:
             client.images.get(image_name)
         except docker.errors.NotFound:
-            pull_image(image_name)
-        command = 'python -u /server/app.py'
-        user = get_sys_user()
+            output('本地 docker 镜像 {} 不存在，开始拉取...'.format(image_name))
+            return_code = os.system('docker pull {}'.format(image_name))
+            if return_code != 0:
+                output('镜像拉取失败，请重试')
+                sys.exit(1)
+            output('镜像拉取成功')
+
+    def _force_remove_container(self, client, container_name):
         try:
             container = client.containers.get(container_name)
             if container.status != 'exited':
@@ -954,22 +923,21 @@ def start_model(self, args):
                     pass
         except docker.errors.NotFound:
             pass
+
+    def _run_by_container(self, client, image_name, command, container_name):
+        home = get_home()
+        user = get_sys_user
         container = client.containers.run(
             image_name,
             command=command,
             name=container_name,
             volumes={home: { 'bind': WORKDIR, 'mode': 'rw' }},
             stop_signal='SIGINT',
-            ports={TEST_SERVER_PORT: TEST_SERVER_PORT},
             user=user,
             detach=True,
-            stream=True,
             auto_remove=True)
-        output('Model {} was registered'.format(model_id))
-        output('\n\tURL: {}/model/{}'.format(TEST_SERVER_ENDPOINT, model_id))
-        output('\tMethod: GET\n')
         try:
-            logs = container.logs(stream=True, follow=True)
+            logs = container.logs(stream=True)
             for log in logs:
                 sys.stdout.write(log.decode('utf-8'))
                 sys.stdout.flush()
@@ -978,26 +946,4 @@ def start_model(self, args):
                 try:
                     container.remove(force=True)
                 except Exception:
-                    pass
-
-    def _get_docker_client(self):
-        try:
-            client = docker.from_env()
-        except docker.errors.DockerException:
-            notice_docker()
-            sys.exit(1)
-        return client
-
-
-def notice_docker():
-    output('请确认 docker 服务是否已开启。')
-    output('启动命令：/etc/init.d/docker start')
-
-
-def pull_image(image_name):
-    output('本地 docker 镜像 {} 不存在，开始拉取...'.format(image_name))
-    return_code = os.system('docker pull {}'.format(image_name))
-    if return_code != 0:
-        output('镜像拉取失败，请重试')
-        sys.exit(1)
-    output('镜像拉取成功')
+                    pass