poly-hammer-utils 0.0.27__py3-none-any.whl → 0.0.29__py3-none-any.whl

poly_hammer_utils/extension/meta_human_dna.py

@@ -2,11 +2,12 @@ import os
 import logging
 import zipfile
 import tempfile
+import shutil
 from pathlib import Path
 from poly_hammer_utils.constants import ENVIRONMENT
 from poly_hammer_utils.utilities import download_and_unzip_to_folder, download_release_file
 from poly_hammer_utils.github.release import GitHubRelease
-from poly_hammer_utils.extension.packager import package_extension, get_addon_version
+from poly_hammer_utils.extension.packager import package_extension, get_addon_version, rename_addon
 from poly_hammer_utils.extension.server import update_extension_index, sync_extensions_from_s3
 
 BLENDER_EXTENSION_SERVER_S3_BUCKET = 'poly-hammer-portal-staging-app-data'
@@ -15,6 +16,13 @@ if ENVIRONMENT == 'production':
 
 BLENDER_EXTENSION_SERVER_S3_FOLDER = 'products/blender-extensions/meta_human_dna'
 
+IGNORE_PATTERNS = [
+    "__pycache__",
+    ".git",
+    ".venv",
+    "*.pyc"
+]
+
 logger = logging.getLogger(__name__)
 
 PREFIX = 'meta_human_dna_core.'
@@ -121,21 +129,52 @@ def get_meta_human_dna_core(addon_version: str, auth_token: str) -> list[Path]:
         file_paths.append(save_path)
     return file_paths
 
-def create_release(addon_folder: Path, releases_folder: Path):
+def copy_and_rename(addon_folder: Path, pro: bool = False) -> Path:
+    temp_addon_folder = Path(tempfile.mkdtemp()) / addon_folder.name
+    if pro:
+        temp_addon_folder = Path(tempfile.mkdtemp()) / f"{addon_folder.name}_pro"
+
+    shutil.copytree(
+        addon_folder,
+        temp_addon_folder,
+        ignore=shutil.ignore_patterns(*IGNORE_PATTERNS)
+    )
+
+    if pro:
+        rename_addon(
+            toml_file_path=temp_addon_folder / 'blender_manifest.toml',
+            constants_file_path=temp_addon_folder / 'constants.py',
+            addon_id='meta_human_dna',
+            new_addon_id='meta_human_dna_pro',
+            new_addon_name="MetaHuman DNA Pro"
+        )
+    else:
+        shutil.rmtree(temp_addon_folder / 'resources' / 'dna', ignore_errors=True)
+
+    return temp_addon_folder
+
+def create_release(addon_folder: Path, releases_folder: Path, pro: bool = False):
     token = os.environ['GH_PAT']
 
+    temp_addon_folder = copy_and_rename(addon_folder=addon_folder, pro=pro)
+
     addon_version = get_addon_version(source_folder=addon_folder)
 
+    s3_prefix = BLENDER_EXTENSION_SERVER_S3_FOLDER
+    if pro:
+        s3_prefix = f'{s3_prefix}_pro'
+        releases_folder = releases_folder / 'pro'
+
     # First, sync existing extensions from S3
     sync_extensions_from_s3(
         repo_folder=releases_folder,
         bucket=BLENDER_EXTENSION_SERVER_S3_BUCKET,
-        s3_prefix=BLENDER_EXTENSION_SERVER_S3_FOLDER,
+        s3_prefix=s3_prefix,
     )
 
     # Create the new .zip files for the addon's various platforms
     addon_zip_files = package_extension(
-        source_folder=addon_folder,
+        source_folder=temp_addon_folder,
         output_folder=releases_folder,
         blender_version=os.environ['BLENDER_VERSION'],
         split_platforms=True,
@@ -155,6 +194,8 @@ def create_release(addon_folder: Path, releases_folder: Path):
     for addon_zip_file in addon_zip_files:
         platform, arch = parse_blender_extension_zip_info(url=addon_zip_file)
         files_to_zip = rig_logic_files + core_files
+
+        # Now add the bindings to the addon .zip
         with zipfile.ZipFile(addon_zip_file, mode="a", compression=zipfile.ZIP_DEFLATED) as zip_file_handle:
             for file_path in files_to_zip:
                 if file_path in rig_logic_files:
@@ -176,7 +217,7 @@ def create_release(addon_folder: Path, releases_folder: Path):
     update_extension_index(
         repo_folder=releases_folder,
         bucket=BLENDER_EXTENSION_SERVER_S3_BUCKET,
-        s3_folder=BLENDER_EXTENSION_SERVER_S3_FOLDER,
+        s3_folder=s3_prefix,
         blender_version=os.environ['BLENDER_VERSION'],
         docker=True
     )
@@ -192,13 +233,16 @@ if __name__ == '__main__':
 
     for addon_name in os.listdir(addons_folder):
         addon_folder = addons_folder / addon_name
+        # Create both the pro and free releases
+        create_release(
+            addon_folder=addon_folder,
+            releases_folder=releases_folder,
+            pro=True
+        )
         create_release(
             addon_folder=addon_folder,
             releases_folder=releases_folder
         )
 
     # Clean up the releases folder
-    for item in releases_folder.iterdir():
-        if item.is_file():
-            item.unlink()
-    releases_folder.rmdir()
+    shutil.rmtree(releases_folder, ignore_errors=True)

poly_hammer_utils/extension/packager.py

@@ -67,4 +67,39 @@ def package_extension(
         
     shell(command, cwd=source_folder)
 
-    return list(output_folder.glob(f'{addon_id}-{addon_version}-*.zip'))
+    return list(output_folder.glob(f'{addon_id}-{addon_version}-*.zip'))
+
+
+def rename_addon(
+        toml_file_path: Path,
+        constants_file_path: Path,
+        addon_id: str,
+        new_addon_id: str,
+        new_addon_name: str,
+):
+    # Update the id and name in the blender_manifest.toml
+    if not toml_file_path.exists():
+        raise FileNotFoundError(f'Manifest file not found: {toml_file_path}')
+
+    manifest_data = tomlkit.parse(toml_file_path.read_text())
+    manifest_data['id'] = new_addon_id
+    manifest_data['name'] = new_addon_name
+    toml_file_path.write_text(tomlkit.dumps(manifest_data))
+    logger.info(f'Updated manifest: id="{new_addon_id}", name="{new_addon_name}"')
+
+    # Update ToolInfo.NAME in constants.py
+    if not constants_file_path.exists():
+        raise FileNotFoundError(f'Constants file not found: {constants_file_path}')
+
+    constants_text = constants_file_path.read_text()
+    updated_text = constants_text.replace(
+        f'NAME: str = "{addon_id}"',
+        f'NAME: str = "{new_addon_id}"',
+    )
+    if updated_text == constants_text:
+        logger.warning(f'Could not find ToolInfo.NAME with value "{addon_id}" in {constants_file_path}')
+    else:
+        constants_file_path.write_text(updated_text)
+        logger.info(f'Updated ToolInfo.NAME to "{new_addon_id}" in {constants_file_path}')
+
+    

{poly_hammer_utils-0.0.27.dist-info → poly_hammer_utils-0.0.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: poly-hammer-utils
-Version: 0.0.27
+Version: 0.0.29
 Summary: 
 Author: Poly Hammer
 Author-email: info@polyhammer.com

{poly_hammer_utils-0.0.27.dist-info → poly_hammer_utils-0.0.29.dist-info}/RECORD

@@ -2,8 +2,8 @@ poly_hammer_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 poly_hammer_utils/addon/packager.py,sha256=apoZhQpd2QeRucFq53u-L1FPmN4MYuiNrjTETAE9NQg,8435
 poly_hammer_utils/addon/release.py,sha256=EZirS8_c9S1OEZoOHStgciu_C7vMxBc_-O5P1fM9Qu4,9074
 poly_hammer_utils/constants.py,sha256=4XGiwn7ip50V1zvmpVD9YZYmE6wPhj2Ark2AXQuJvSc,228
-poly_hammer_utils/extension/meta_human_dna.py,sha256=9DYV4evfFJz-UDDm-9fwegGKz3JHhhE6UaRr_cTlVD0,7894
-poly_hammer_utils/extension/packager.py,sha256=LyThqLWgvlQOrcn9OSChrV675iiwHTvcMCeXwAab_vM,2365
+poly_hammer_utils/extension/meta_human_dna.py,sha256=_fAmEqUpAF6SU8qv-SV05A08KyWoV6ywcwInlKqACHo,9179
+poly_hammer_utils/extension/packager.py,sha256=ba2_vEoBKv5WojdcaZTvw-YPTrp3jZUnGa6M1k87dL4,3646
 poly_hammer_utils/extension/server.py,sha256=vuDMqEehgFiFiUy-R28oKzijHo5wIJzW0l66wwPU6I8,8072
 poly_hammer_utils/github/release.py,sha256=P4vrNvdgWuzJI0mRye09BP6vL5b7kQ5fpuDDnEqJbwg,9951
 poly_hammer_utils/helpers.py,sha256=f_2fNrydsbIvwD2LuoBj2gjETMP7dFzJtq1_7WMBwNI,1655
@@ -11,6 +11,6 @@ poly_hammer_utils/launch.py,sha256=Nc9FlFuGtMSjgSLsk6MMMj-FECsOGtfUQlZaUZt_rGU,4
 poly_hammer_utils/resources/scripts/blender/startup.py,sha256=eUd0VwAHjTwIscVKCbk_0-F7p0jgIEsVYdzpIjlzOK0,2282
 poly_hammer_utils/resources/scripts/unreal/init_unreal.py,sha256=1-d9IU8ZSAIS3MUANrsGx4ZmqNJ5f8S2k8XJVg0Bghs,693
 poly_hammer_utils/utilities.py,sha256=7dmZo02HXbWhfmwDHkgVUE_gyq4e-gqb4OdBc2bokbs,6491
-poly_hammer_utils-0.0.27.dist-info/METADATA,sha256=mCH82DZKRLGP3hMdfgdYvpyP43tCcZXUq5udcWFGDsY,934
-poly_hammer_utils-0.0.27.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-poly_hammer_utils-0.0.27.dist-info/RECORD,,
+poly_hammer_utils-0.0.29.dist-info/METADATA,sha256=EbUmEcBX-y_G25PLB0XrLwXU5Pkq3hWJcl11jju1x6I,934
+poly_hammer_utils-0.0.29.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+poly_hammer_utils-0.0.29.dist-info/RECORD,,