update sessions presets

Resolve "Numpy mesh serialization error"

See merge request slumber/multi-user!175

.gitlab-ci.yml

@@ -1,13 +1,5 @@
 stages:
-  - test
   - build
-  - deploy
-  - doc
-
-
 
 include:
-  - local: .gitlab/ci/test.gitlab-ci.yml
-  - local: .gitlab/ci/build.gitlab-ci.yml
-  - local: .gitlab/ci/deploy.gitlab-ci.yml
-  - local: .gitlab/ci/doc.gitlab-ci.yml
+  - local: .gitlab/ci/build.gitlab-ci.yml

.gitlab/ci/build.gitlab-ci.yml

@@ -1,6 +1,5 @@
 build:
   stage: build
-  needs: ["test"]
   image: debian:stable-slim
   script:
     - rm -rf tests .git .gitignore script

CHANGELOG.md

@@ -240,3 +240,34 @@ All notable changes to this project will be documented in this file.
 - Skin vertex radius synchronization (@kromar)
 - Sequencer audio strip synchronization
 - Crash with empty after a reconnection
+
+## [0.5.1] - 2022-02-10
+
+### Fixed
+
+- Auto updater breaks dependency auto installer
+- Auto updater update from tag
+
+## [0.5.2] - 2022-02-18
+
+### Fixed
+
+- Objects not selectable after user leaves session
+- Geometry nodes attribute toogle doesn't sync
+
+## [0.5.3] - 2022-03-11
+
+### Changed
+
+- Snapshots logs
+### Fixed
+
+- Server crashing during snapshots
+- Blender 3.1 numpy loading error during early connection process
+- Server docker arguments
+
+## [0.5.5] - 2022-06-12
+
+### Fixed
+
+- Numpy mesh serialization error

docs/conf.py

@@ -16,12 +16,12 @@ import sys
 
 # -- Project information -----------------------------------------------------
 
-project = 'Multi-User 0.5.0 Documentation'
+project = 'Multi-User 0.5.x Documentation'
 copyright = '2020, Swann Martinez'
 author = 'Swann Martinez, Poochy, Fabian'
 
 # The full version, including alpha/beta/rc tags
-version_release = '0.5.1-develop'
+version_release = '0.5.5'
 
 
 # -- General configuration ---------------------------------------------------

multi_user/__init__.py

@@ -19,7 +19,7 @@
 bl_info = {
     "name": "Multi-User",
     "author": "Swann Martinez",
-    "version": (0, 5, 0),
+    "version": (0, 5, 8),
     "description": "Enable real-time collaborative workflow inside blender",
     "blender": (2, 82, 0),
     "location": "3D View > Sidebar > Multi-User tab",

multi_user/addon_updater.py

@@ -1015,16 +1015,18 @@ class Singleton_updater(object):
 		for path, dirs, files in os.walk(base):
 			# prune ie skip updater folder
 			dirs[:] = [d for d in dirs if os.path.join(path,d) not in [self._updater_path]]
+
+			for directory in dirs:
+				shutil.rmtree(os.path.join(path,directory))
+
 			for file in files:
-				for ptrn in self.remove_pre_update_patterns:
-					if fnmatch.filter([file],ptrn):
-						try:
-							fl = os.path.join(path,file)
-							os.remove(fl)
-							if self._verbose: print("Pre-removed file "+file)
-						except OSError:
-							print("Failed to pre-remove "+file)
-							self.print_trace()
+				try:
+					fl = os.path.join(path,file)
+					os.remove(fl)
+					if self._verbose: print("Pre-removed file "+file)
+				except OSError:
+					print("Failed to pre-remove "+file)
+					self.print_trace()
 
 		# Walk through the temp addon sub folder for replacements
 		# this implements the overwrite rules, which apply after
@@ -1701,7 +1703,7 @@ class GitlabEngine(object):
 	def parse_tags(self, response, updater):
 		if response == None:
 			return []
-		return [{"name": tag["name"], "zipball_url": self.get_zip_url(tag["commit"]["id"], updater)} for tag in response]
+		return [{"name": tag["name"], "zipball_url": f"https://gitlab.com/slumber/multi-user/-/jobs/artifacts/{tag['name']}/download?job=build"} for tag in response]
 
 
 # -----------------------------------------------------------------------------

multi_user/addon_updater_ops.py

@@ -267,7 +267,7 @@ class addon_updater_update_now(bpy.types.Operator):
 	clean_install: bpy.props.BoolProperty(
 		name="Clean install",
 		description="If enabled, completely clear the addon's folder before installing new update, creating a fresh install",
-		default=False,
+		default=True,
 		options={'HIDDEN'}
 	)
 

multi_user/bl_types/bl_object.py

@@ -172,7 +172,7 @@ def load_modifier_geometry_node_props(dumped_modifier: dict, target_modifier: bp
     for input_index, inpt in enumerate(get_node_group_properties_identifiers(target_modifier.node_group)):
         dumped_value, dumped_type = dumped_modifier['props'][input_index]
         input_value = target_modifier[inpt[0]]
-        if dumped_type in ['INT', 'VALUE', 'STR']:
+        if dumped_type in ['INT', 'VALUE', 'STR', 'BOOL']:
             logging.info(f"{inpt[0]}/{dumped_value}")
             target_modifier[inpt[0]] = dumped_value
         elif dumped_type in ['RGBA', 'VECTOR']:

multi_user/bl_types/dump_anything.py

@@ -26,7 +26,8 @@ import numpy as np
 BPY_TO_NUMPY_TYPES = {
     'FLOAT': np.float32,
     'INT': np.int32,
-    'BOOL': np.bool}
+    'BOOL': np.bool,
+    'BOOLEAN': np.bool}
 
 PRIMITIVE_TYPES = ['FLOAT', 'INT', 'BOOLEAN']
 

multi_user/environment.py

@@ -30,8 +30,8 @@ VERSION_EXPR = re.compile('\d+.\d+.\d+')
 DEFAULT_CACHE_DIR = os.path.join(
     os.path.dirname(os.path.abspath(__file__)), "cache")
 REPLICATION_DEPENDENCIES = {
-    "zmq",
-    "deepdiff"
+    ("pyzmq", "25.0.0"),
+    ("deepdiff","5.7.0"),
 }
 LIBS = os.path.join(os.path.dirname(os.path.abspath(__file__)), "libs")
 REPLICATION = os.path.join(LIBS,"replication")
@@ -55,7 +55,7 @@ def install_pip():
     subprocess.run([str(PYTHON_PATH), "-m", "ensurepip"])
 
 
-def install_package(name: str, install_dir: str):
+def install_package(name: str, version:str=None, install_dir: str=None):
     logging.info(f"installing {name} version...")
     env = os.environ
     if "PIP_REQUIRE_VIRTUALENV" in env:
@@ -65,7 +65,8 @@ def install_package(name: str, install_dir: str):
         # env var for the subprocess.
         env = os.environ.copy()
         del env["PIP_REQUIRE_VIRTUALENV"]
-    subprocess.run([str(PYTHON_PATH), "-m", "pip", "install", f"{name}", "-t", install_dir], env=env)
+    module_name = f"{name}" if version is None else f"{name}=={version}"
+    subprocess.run([str(PYTHON_PATH), "-m", "pip", "install", module_name, "-t", install_dir], env=env)
 
     if name in sys.modules:
         del sys.modules[name]
@@ -119,7 +120,7 @@ def remove_paths(paths: list):
             sys.path.remove(path)
 
 
-def install_modules(dependencies: list, python_path: str, install_dir: str):
+def install_modules(dependencies: tuple, python_path: str, install_dir: str):
     global PYTHON_PATH, SUBPROCESS_DIR
 
     PYTHON_PATH = Path(python_path)
@@ -128,9 +129,9 @@ def install_modules(dependencies: list, python_path: str, install_dir: str):
     if not module_can_be_imported("pip"):
         install_pip()
 
-    for package_name in dependencies:
+    for package_name, package_version in dependencies:
         if not module_can_be_imported(package_name):
-            install_package(package_name, install_dir=install_dir)
+            install_package(package_name, version=package_version, install_dir=install_dir)
             module_can_be_imported(package_name)
 
 def register():

multi_user/handlers.py

@@ -133,7 +133,7 @@ def load_pre_handler(dummy):
 
 @persistent
 def update_client_frame(scene):
-    if session and session.state == STATE_ACTIVE:
+    if session and session.state == STATE_ACTIVE and bpy.context.screen and not bpy.context.screen.is_animation_playing:
         porcelain.update_user_metadata(session.repository, {
             'frame_current': scene.frame_current
         })

multi_user/operators.py

@@ -297,17 +297,20 @@ def setup_timer():
     session_user_sync = timers.SessionUserSync()
     session_background_executor = timers.MainThreadExecutor(execution_queue=background_execution_queue)
     session_listen = timers.SessionListenTimer(timeout=0.001)
+    session_frame_sync = timers.SessionFrameSync(timeout=1)
 
     session_listen.register()
     session_update.register()
     session_user_sync.register()
     session_background_executor.register()
+    session_frame_sync.register()
 
     deleyables.append(session_background_executor)
     deleyables.append(session_update)
     deleyables.append(session_user_sync)
     deleyables.append(session_listen)
     deleyables.append(timers.AnnotationUpdates())
+    deleyables.append(session_frame_sync)
 
 def get_active_server_preset(context):
     active_index = context.window_manager.server_index

multi_user/preferences.py

@@ -44,13 +44,27 @@ DEFAULT_PRESETS = {
         "admin_password": "admin",
         "server_password": ""
     },
-    "public session" : {
-        "server_name": "public session",
-        "ip": "51.75.71.183",
+    "NTHU Session 1" : {
+        "server_name": "Session 1",
+        "ip": "31.38.153.178",
         "port": 5555,
         "admin_password": "",
         "server_password": ""
     },
+        "NTHU Session 2" : {
+        "server_name": "Session 2",
+        "ip": "31.38.153.178",
+        "port": 5655,
+        "admin_password": "",
+        "server_password": ""
+    },
+        "NTHU Session 3" : {
+        "server_name": "Session 3",
+        "ip": "31.38.153.178",
+        "port": 5755,
+        "admin_password": "",
+        "server_password": ""
+    }
 }
 
 def randomColor():

multi_user/timers.py

@@ -177,6 +177,7 @@ class AnnotationUpdates(Timer):
                                     affect_dependencies=False)
                     self._annotating = False
 
+
 class DynamicRightSelectTimer(Timer):
     def __init__(self, timeout=.1):
         super().__init__(timeout)
@@ -266,7 +267,7 @@ class DynamicRightSelectTimer(Timer):
 
 
 class ClientUpdate(Timer):
-    def __init__(self, timeout=.1):
+    def __init__(self, timeout=1):
         super().__init__(timeout)
         self.handle_quit = False
         self.users_metadata = {}
@@ -387,3 +388,12 @@ class MainThreadExecutor(Timer):
             function, kwargs = self.execution_queue.get()
             logging.debug(f"Executing {function.__name__}")
             function(**kwargs)
+
+    
+class SessionFrameSync(Timer):
+    def execute(self):
+        if session and session.state == STATE_ACTIVE:
+            if bpy.context.screen and bpy.context.screen.is_animation_playing:
+                porcelain.update_user_metadata(session.repository, {
+                    'frame_current': bpy.context.scene.frame_current
+                })

scripts/docker_server/Dockerfile

@@ -22,4 +22,4 @@ RUN pip install replication==$replication_version
 
 # Run the server with parameters
 ENTRYPOINT ["/bin/sh", "-c"]
-CMD  ["replication.serve -apwd ${password} -spwd '' -p ${port} -t ${timeout} -l ${log_level} -lf ${log_file}"]
+CMD  ["replication.server -apwd ${password} -spwd '' -p ${port} -t ${timeout} -l ${log_level} -lf ${log_file}"]