Merge pull request #32 from OpenRL-Lab/dev

format

Author: huangshiyu13

openplugin/install/__init__.py

@@ -17,9 +17,11 @@
 """"""
 
 from openplugin.install.local_install import install_local_plugin
-from openplugin.install.zip_install import install_zip_plugin
 from openplugin.install.remote_install import remote_install
 from openplugin.install.uninstall import uninstall_plugin
+from openplugin.install.zip_install import install_zip_plugin
+
+
 def install_plugin(plugin_name: str) -> bool:
     if plugin_name == "./" or plugin_name == ".":
         print("Installing current directory as plugin...")
@@ -31,8 +33,7 @@ def install_plugin(plugin_name: str) -> bool:
 
     return remote_install(plugin_name)
 
+
 def reinstall_plugin(plugin_name: str) -> bool:
     uninstall_plugin(plugin_name)
     return install_plugin(plugin_name)
-
-

openplugin/install/list_plugins.py

@@ -16,9 +16,9 @@
 
 """"""
 from openplugin.utils.util import (
+    get_plugin_directory,
     get_plugin_list,
     get_plugin_version,
-get_plugin_directory,
 )
 
 
@@ -27,5 +27,5 @@ def list_plugins() -> bool:
     plugin_directory = get_plugin_directory()
     print("Installed plugins:")
     for plugin in plugin_list:
-        plugin_version = get_plugin_version(plugin_directory/plugin)
+        plugin_version = get_plugin_version(plugin_directory / plugin)
         print(f"{plugin}:{plugin_version}")

openplugin/install/local_install.py

@@ -21,9 +21,12 @@
 import tempfile
 import zipfile
 
-
 from openplugin.utils.local_plugin_utils import check_local_plugin
-from openplugin.utils.util import get_plugin_directory, make_zip_file,get_plugin_version
+from openplugin.utils.util import (
+    get_plugin_directory,
+    get_plugin_version,
+    make_zip_file,
+)
 
 
 def install_local_plugin() -> bool:

openplugin/install/remote_install.py

@@ -16,18 +16,19 @@
 
 """"""
 import io
-
 import zipfile
+
 import requests
 
 from openplugin.utils.util import (
     get_plugin_directory,
     get_plugin_list,
-    get_zip_file_url,
     get_plugin_version,
+    get_zip_file_url,
 )
 
-def remote_install(plugin_name: str)-> bool:
+
+def remote_install(plugin_name: str) -> bool:
     plugin_list = get_plugin_list()
     if plugin_name in plugin_list:
         print("Plugin {} already installed!".format(plugin_name))
@@ -47,5 +48,5 @@ def remote_install(plugin_name: str)-> bool:
         plugin_version = get_plugin_version(plugin_directory / plugin_name)
     except:
         raise ValueError("plugin {} not found".format(plugin_name))
-    print("Installed plugin: {}:{}!".format(plugin_name,plugin_version))
-    return True
+    print("Installed plugin: {}:{}!".format(plugin_name, plugin_version))
+    return True

openplugin/install/uninstall.py

@@ -24,6 +24,7 @@
     get_plugin_version,
 )
 
+
 def uninstall_plugin(plugin_name: str) -> bool:
     plugin_list = get_plugin_list()
     if plugin_name not in plugin_list:
@@ -34,4 +35,4 @@ def uninstall_plugin(plugin_name: str) -> bool:
     plugin_version = get_plugin_version(plugin_path)
     if plugin_path.exists() and plugin_path.is_dir():
         shutil.rmtree(plugin_path)
-    print("Uninstalled plugin: {}:{}!".format(plugin_name,plugin_version))
+    print("Uninstalled plugin: {}:{}!".format(plugin_name, plugin_version))

openplugin/install/zip_install.py

@@ -19,26 +19,23 @@
 import shutil
 import tempfile
 import zipfile
-
 from pathlib import Path
 
 from openplugin.utils.local_plugin_utils import check_local_plugin
-
 from openplugin.utils.util import (
-    get_plugin_list,
     get_plugin_directory,
-get_plugin_version,
-
+    get_plugin_list,
+    get_plugin_version,
 )
 
+
 def install_zip_plugin(plugin_zip_file_path: str) -> bool:
     assert plugin_zip_file_path.endswith(".zip")
 
     tempdir = tempfile.mkdtemp()
     z = zipfile.ZipFile(plugin_zip_file_path)
     z.extractall(tempdir)
 
-
     plugin_name = check_local_plugin(Path(tempdir).iterdir().__next__())
     shutil.rmtree(tempdir, ignore_errors=True)
     plugin_list = get_plugin_list()
@@ -56,6 +53,5 @@ def install_zip_plugin(plugin_zip_file_path: str) -> bool:
     except:
         raise ValueError("Install {} failed".format(plugin_name))
 
-
-    print("Installed plugin: {}:{}!".format(plugin_name,plugin_version))
-    return True
+    print("Installed plugin: {}:{}!".format(plugin_name, plugin_version))
+    return True

openplugin/utils/local_plugin_utils.py

@@ -19,8 +19,8 @@
 from pathlib import Path
 
 
-def check_local_plugin(plugin_path:str = "./") -> str:
-    info_file = Path(plugin_path)/"info.json"
+def check_local_plugin(plugin_path: str = "./") -> str:
+    info_file = Path(plugin_path) / "info.json"
 
     assert info_file.exists(), "info.json not found"
     info_dict = json.load(open(info_file, "r"))

openplugin/utils/util.py

@@ -15,14 +15,14 @@
 # limitations under the License.
 
 """"""
+import json
 import os
 import platform
 import re
 import shutil
 from pathlib import Path
-from typing import Dict,Union
+from typing import Dict, Union
 
-import json
 import numpy as np
 
 import openplugin
@@ -47,15 +47,18 @@ def get_plugin_list():
                 plugin_list.append(plugin.name)
     return plugin_list
 
-def get_plugin_version(plugin_path: Union[Path,str]) -> str:
+
+def get_plugin_version(plugin_path: Union[Path, str]) -> str:
     if isinstance(plugin_path, str):
         plugin_path = Path(plugin_path)
-    info_file = plugin_path/"info.json"
+    info_file = plugin_path / "info.json"
     assert info_file.exists(), "Plugin info file not found!"
 
     with open(info_file) as f:
         info = json.load(f)
     return info["version"]
+
+
 def make_zip_file(dir_to_put_file_in, plugin_directory, plugin_name):
     # create a zip file
     zip_file_name = plugin_name