Unit tests

* Set up pytest

* asset tests

* material tests

* hello_world tests

* Iterate github workflows

* Update tests

* fix gh actions

* Remove installation checks for now

* Ignore dependencies folder

* Test improvements

* Fix unit test commit pyproject toml

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+- package-ecosystem: pip
+  directory: "/"
+  schedule:
+    interval: weekly
+    time: "13:00"
+  groups:
+    python-packages:
+      patterns:
+        - "*"

.github/workflows/checks.yml

@@ -0,0 +1,40 @@
+
+name: Lint & Test
+
+on:
+  pull_request:
+    branches:
+    - main
+    - develop
+  push:
+    branches:
+    - main
+    - develop
+
+jobs:
+
+  checks:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: |
+          pip install .[dev]
+
+      - name: Lint with ruff
+        run: |
+          # stop the build if there are Python syntax errors or undefined names
+          ruff --format=github --select=E9,F63,F7,F82 .
+          # default set of ruff rules with GitHub Annotations
+          #ruff --format=github . # to be enabled in a future PR
+      - name: Test with pytest
+        run: |
+          pytest tests --doctest-modules --junitxml=junit/test-results.xml --cov=com --cov-report=xml --cov-report=html

.gitignore

@@ -4,6 +4,9 @@ blender
 blender.tar.xz
 Blender.app
 
+.coverage
+coverage.xml
+
 */rclone.zip
 */miniconda.sh
 

.pre-commit-config.yaml

@@ -0,0 +1,16 @@
+
+repos:
+
+# config from https://black.readthedocs.io/en/stable/integrations/source_version_control.html
+#- repo: https://github.com/psf/black
+#    rev: 23.7.0
+#    hooks:
+#      - id: black
+#        language_version: python3.10
+
+# config from https://github.com/astral-sh/ruff-pre-commit
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.0.285
+  hooks:
+    - id: ruff
+

examples/generate_individual_assets.py

@@ -36,13 +36,13 @@
 from infinigen.core.util.logging import Suppress
 from infinigen.core.util import blender as butil
 
-from datagen.tools.results import strip_alpha_background as strip_alpha_background
+from infinigen.datagen.tools.results import strip_alpha_background as strip_alpha_background
 
 import generate_nature  # to load most/all factory.AssetFactory subclasses
 
 def build_scene_asset(factory_name, idx):
     factory = None
-    for subdir in os.listdir('assets'):
+    for subdir in os.listdir('infinigen/assets'):
         with gin.unlock_config():
             module = importlib.import_module(f'assets.{subdir.split(".")[0]}')
         if hasattr(module, factory_name):
@@ -91,7 +91,7 @@ def build_scene_asset(factory_name, idx):
 def build_scene_surface(factory_name, idx):
     try:
         with gin.unlock_config():
-            scatter = importlib.import_module(f'surfaces.scatters.{factory_name}')
+            scatter = importlib.import_module(f'infinigen.assets.scatters.{factory_name}')
 
             if not hasattr(scatter, 'apply'):
                 raise ValueError(f'{scatter} has no apply()')
@@ -109,7 +109,7 @@ def build_scene_surface(factory_name, idx):
     except ModuleNotFoundError:
         try:
             with gin.unlock_config():
-                template = importlib.import_module(f'assets.materials.{factory_name}')
+                template = importlib.import_module(f'infinigen.assets.materials.{factory_name}')
                 bpy.ops.mesh.primitive_ico_sphere_add(radius=.8, subdivisions=9)
                 asset = bpy.context.active_object
                 template.apply(asset)

examples/scripts/hello_world_stepbystep.sh

@@ -1,3 +1,5 @@
+# DO NOT MODIFY STRUCTURE OR COMMENTS: commands are read by test_hello_world.py
+
 # Generate a scene layout
 python examples/generate_nature.py -- --seed 0 --task coarse -g desert.gin simple.gin --output_folder outputs/helloworld/coarse
 

infinigen/__init__.py

@@ -1 +1,3 @@
-__version__ = '1.1.0'
+import pkg_resources
+from pathlib import Path
+__version__ = pkg_resources.get_distribution(Path(__file__).parent.name).version

infinigen/assets/creatures/__init__.py

@@ -6,3 +6,4 @@
 from .crustacean import CrustaceanFactory, CrabFactory, LobsterFactory, SpinyLobsterFactory
 from .reptile import FrogFactory, LizardFactory, SnakeFactory
 from .insects.dragonfly import DragonflyFactory
+from .jellyfish import JellyfishFactory

infinigen/assets/creatures/beetle.py

@@ -22,6 +22,7 @@
 
 from infinigen.core.placement.factory import AssetFactory, make_asset_collection
 from infinigen.core.util.math import lerp, clip_gaussian, FixedSeed
+from infinigen.core import surface
 import infinigen.assets.materials.chitin
 from infinigen.assets.utils.tag import tag_object, tag_nodegroup
 
@@ -103,7 +104,7 @@ def beetle_genome():
         parts=body,
         postprocess_params=dict(
             surface_registry=[
-                (assets.materials.chitin, 1)
+                (infinigen.assets.materials.chitin, 1)
             ],
             hair=insect_hair_params()
         )

infinigen/assets/creatures/bird.py

@@ -30,6 +30,7 @@
 from infinigen.core.util.math import clip_gaussian, FixedSeed
 from infinigen.core.util.random import random_general as rg
 from infinigen.core.util import blender as butil
+from infinigen.core import surface
 
 from infinigen.core.placement.factory import AssetFactory
 from infinigen.assets.creatures.util.creature_util import offset_center
@@ -150,10 +151,10 @@ def duck_genome(mode):
             animation=dict(), 
             hair=bird_hair_params(flying=False),
             surface_registry=[
-                (assets.materials.spot_sparse_attr, 4),
-                (assets.materials.reptile_brown_circle_attr, 0.5),
-                (assets.materials.reptile_two_color_attr, 0.5),
-                (assets.materials.bird, 5)
+                (infinigen.assets.materials.spot_sparse_attr, 4),
+                (infinigen.assets.materials.reptile_brown_circle_attr, 0.5),
+                (infinigen.assets.materials.reptile_two_color_attr, 0.5),
+                (infinigen.assets.materials.bird, 5)
             ]
         ) 
     )
@@ -227,10 +228,10 @@ def flying_bird_genome(mode):
             animation=dict(), 
             hair=bird_hair_params(flying=True),
             surface_registry=[
-                #(assets.materials.spot_sparse_attr, 4),
-                #(assets.materials.reptile_brown_circle_attr, 0.5),
-                #(assets.materials.reptile_two_color_attr, 0.5),
-                (assets.materials.bird, 5)
+                #(infinigen.assets.materials.spot_sparse_attr, 4),
+                #(infinigen.assets.materials.reptile_brown_circle_attr, 0.5),
+                #(infinigen.assets.materials.reptile_two_color_attr, 0.5),
+                (infinigen.assets.materials.bird, 5)
             ]
         ) 
     )

infinigen/assets/creatures/carnivore.py

@@ -169,9 +169,9 @@ def tiger_genome():
             hair=tiger_hair_params(),
             skin=tiger_skin_sim_params(),
             surface_registry=[
-                (assets.materials.tiger_attr, 3),
-                (assets.materials.giraffe_attr, 0.2),
-                (assets.materials.spot_sparse_attr, 2)
+                (infinigen.assets.materials.tiger_attr, 3),
+                (infinigen.assets.materials.giraffe_attr, 0.2),
+                (infinigen.assets.materials.spot_sparse_attr, 2)
             ]
         ) 
     )

infinigen/assets/creatures/fish.py

@@ -169,8 +169,8 @@ def fish_genome():
             cloth=fish_fin_cloth_sim_params(),
             anim=fish_swim_params(),
             surface_registry=[
-                (assets.materials.fishbody, 3),
-                #(assets.materials.scale, 1),
+                (infinigen.assets.materials.fishbody, 3),
+                #(infinigen.assets.materials.scale, 1),
             ]
         ) 
     )

infinigen/assets/creatures/herbivore.py

@@ -166,14 +166,14 @@ def herbivore_genome():
     if U() < 1:
         hair = herbivore_hair()
         registry = [
-            (assets.materials.giraffe_attr, 1),
-            (assets.materials.spot_sparse_attr, 3)
+            (infinigen.assets.materials.giraffe_attr, 1),
+            (infinigen.assets.materials.spot_sparse_attr, 3)
         ]
     else:
         hair = None
         registry = [
-            (assets.materials.reptile_brown_circle_attr, 1),
-            (assets.materials.reptile_gray_attr, 1)
+            (infinigen.assets.materials.reptile_brown_circle_attr, 1),
+            (infinigen.assets.materials.reptile_gray_attr, 1)
         ]
 
     return genome.CreatureGenome(

infinigen/assets/creatures/reptile.py

@@ -115,7 +115,7 @@ def dinosaur():
         postprocess_params=dict(
             animation=dict(), 
             surface_registry=[
-                (assets.materials.snake_scale, 1),
+                (infinigen.assets.materials.snake_scale, 1),
             ]
         ) 
     )
@@ -178,7 +178,7 @@ def lizard_genome():
         postprocess_params=dict(
             anim=lizard_run_params(),
             surface_registry=[
-                (assets.materials.snake_scale, 1),
+                (infinigen.assets.materials.snake_scale, 1),
             ]
         ) 
     )
@@ -227,7 +227,7 @@ def snake_genome():
         postprocess_params=dict(
             anim=snake_swim_params(),
             surface_registry=[
-                (assets.materials.snake_scale, 1),
+                (infinigen.assets.materials.snake_scale, 1),
             ]
         ) 
     )
@@ -243,7 +243,7 @@ def chameleon_genome():
         postprocess_params=dict(
             anim=snake_swim_params(),
             surface_registry=[
-                (assets.materials.snake_scale, 1),
+                (infinigen.assets.materials.snake_scale, 1),
             ]
         ) 
     )
@@ -304,7 +304,7 @@ def frog_genome():
                 speed_m_s=0.5
             ), 
             surface_registry=[
-                (assets.materials.snake_scale, 1),
+                (infinigen.assets.materials.snake_scale, 1),
             ]
         ) 
     )

infinigen/assets/grassland/__init__.py

@@ -6,4 +6,5 @@
 
 from .dandelion import DandelionFactory, DandelionSeedFactory
 from .flowerplant import FlowerPlantFactory
-from .grass_tuft import GrassTuftFactory
+from .grass_tuft import GrassTuftFactory
+from .flower import FlowerFactory

infinigen/assets/leaves/__init__.py

@@ -0,0 +1,7 @@
+from .leaf import BerryFactory, LeafFactory
+from .leaf_broadleaf import LeafFactoryBroadleaf
+from .leaf_ginko import LeafFactoryGinko
+from .leaf_maple import LeafFactoryMaple
+from .leaf_pine import LeafFactoryPine
+from .leaf_v2 import LeafFactoryV2
+from .leaf_wrapped import LeafFactoryWrapped

infinigen/assets/leaves/leaf.py

@@ -87,7 +87,7 @@ def create_asset(self, **params) -> bpy.types.Object:
         butil.apply_transform(obj)
 
         return obj
-
+        
 class BerryFactory(AssetFactory):
 
     def __init__(self, factory_seed, genome, coarse=False):

infinigen/assets/monocot/__init__.py

@@ -1,6 +1,5 @@
 from .agave import AgaveMonocotFactory
-from .grasses import GrassesMonocotFactory, WheatMonocotFactory, WheatEarMonocotFactory, MaizeMonocotFactory, \
-    ReedMonocotFactory
+from .grasses import GrassesMonocotFactory, WheatMonocotFactory, WheatEarMonocotFactory, MaizeMonocotFactory
 from .tussock import TussockMonocotFactory
 from .pinecone import PineconeFactory
 from .generate import MonocotFactory

infinigen/assets/scatters/__init__.py

@@ -0,0 +1,2 @@
+from .moss import MossFactory
+from .lichen import LichenFactory

infinigen/assets/underwater/__init__.py

@@ -1 +1,2 @@
-from . import seaweed, urchin
+from .seaweed import SeaweedFactory
+from .urchin import UrchinFactory

infinigen/assets/weather/__init__.py

@@ -1,3 +1,15 @@
 from . import particles, cloud
-from .cloud import CloudFactory
+from .cloud import (
+    CloudFactory, 
+    CumulonimbusFactory, 
+    CumulusFactory, 
+    AltocumulusFactory, 
+    StratocumulusFactory
+)
+from .particles import (
+    DustMoteFactory,
+    RaindropFactory,
+    SnowflakeFactory
+)
+
 from .kole_clouds import add_kole_clouds

infinigen/core/placement/detail.py

@@ -24,7 +24,7 @@
 IS_COARSE = False # Global VARIABLE, set by examples/generate_nature.py and used only for whether to emit warnings
 
 @gin.configurable
-def scatter_res_distance(dist):
+def scatter_res_distance(dist=4):
     return dist
 
 @gin.configurable

infinigen/core/util/blender.py

@@ -777,7 +777,8 @@ def approve_all_drivers():
 def count_objects():
     count = 0
     for obj in bpy.context.scene.objects:
-        if element.type != "MESH": continue
+        if obj.type != "MESH": 
+            continue
         count +=1
     return count