Fixes after verbosity merge

smartsim/_core/control/previewrenderer.py

@@ -105,7 +105,6 @@ def render(
         config=CONFIG,
         verbosity_level=verbosity_level,
     )
-    print(rendered_preview)
     return rendered_preview
 
 

templates/templates/preview/ensemble_plain_text_debug.template

@@ -1,21 +1,31 @@
-       
+
     {%- for ensemble in manifest.ensembles %}
     = Ensemble Name: {{ ensemble.name }} =
         Members: {{ ensemble|length }}
         {%- if ensemble.params %}
-        Ensemble Parameters:  
+        Ensemble Parameters:
             {%- for key, value in ensemble.params.items() %}
           {{ key }}: {{ '{:^9}'.format(value|string)|truncate(81,true,'...')}}
-                {%- endfor %}   
-    {%- endif %}   
+        {%- endfor %}
+        {%- endif %}
+        {%- if ensemble.batch_settings %}
+        Batch Launch: True
+        Batch Command: {{ ensemble.batch_settings.batch_cmd }}
+        {%- endif %}
+        {%- if ensemble.batch_settings.batch_args %}
+        Batch Arguments:
+        {%- for key, value in ensemble.batch_settings.batch_args.items() %}
+          {{ key }}: {{ value }}
+        {%- endfor %}
+        {%- endif %}
     {% for model in ensemble %}
     - Model Name: {{ model.name }} -
     {%- include 'preview/model_plain_text.template' %}
             {%- if model.run_settings.colocated_db_settings %}
                 {% include "preview/clientconfigcolo_plain_text.template" %}
             {%- endif %}
             {%- if manifest.dbs %}
-            {%- include "preview/clientconfig_plain_text.template" %}
-            {%- endif %}
-    {% endfor %}
-    {% endfor %}
+            {% include "preview/clientconfig_plain_text.template" %}
+        {%- endif %}
+        {% endfor %}
+        {% endfor %}

templates/templates/preview/model_plain_text_debug.template

@@ -1,37 +1,50 @@
- {%- if model is defined %}
+
+    {%- if model is defined %}
         Executable: {{ model.run_settings.exe[0] }}
         Executable Arguments:
         {%- for param in model.run_settings.exe_args %}
           {{ param }}
         {%- endfor %}
-        {%- if model.batch_settings -%}
+        {%- if model.run_settings.run_command %}
+        Run Command: {{ model.run_settings.run_command }}
+        {%- endif %}
+        {%- if model.run_settings.run_args %}
+        Run Arguments:
+        {%- for key, value in model.run_settings.run_args.items() %}
+          {{ key }}: {{ value }}
+        {%- endfor %}
+        {%- endif %}
+        {%- if model.batch_settings %}
         Batch Launch: True
-        {% else %}
-        Batch Launch: False        
-        {%- endif %} 
-        {%- if model.params %}    
-        Model Parameters: 
+        Batch Command: {{ model.batch_settings.batch_cmd }}
+        Batch Arguments:
+        {%- for key, value in model.batch_settings.batch_args.items() %}
+          {{ key }}: {{ value }}
+        {%- endfor %}
+        {%- endif -%}
+        {%- if model.params %}
+        Model Parameters:
         {%- for param, value in model.params.items() %}
           {{ param }}: {{ value }}
         {%- endfor -%}
         {% endif %}
         {%- if model.files %}
         {%- if model.files.tagged %}
-        Tagged Files for Model Configuration: 
+        Tagged Files for Model Configuration:
         {%- for tagged in model.files.tagged %}
-          {{ tagged }} 
+          {{ tagged }}
           -> {{ model.path }}
         {%- endfor %}
         {%- endif -%}
         {%- if model.files.copy %}
-        Copy Files: 
+        Copy Files:
         {%- for copy in model.files.copy %}
-        {{ copy }}
+          {{ copy }}
           -> {{ model.path }}
         {%- endfor %}
         {%- endif %}
         {%- if model.files.link %}
-        Symlink Files: 
+        Symlink Files:
         {%- for link in model.files.link %}
           {{ link }}
           -> {{ model.path }}
@@ -42,7 +55,7 @@
         Colocated:
         {%- if model.run_settings.colocated_db_settings.db_identifier %}
           Database Identifier: {{ model.run_settings.colocated_db_settings.db_identifier }}
-          {%- endif %}
+          {% endif %}
           {%- if model.run_settings.colocated_db_settings.port %}
           Connection Type: TCP
           TCP/IP Port(s):
@@ -57,38 +70,39 @@
           {%- endif %}
           CPUs: {{ model.run_settings.colocated_db_settings.cpus }}
           Custom Pinning: {{ model.run_settings.colocated_db_settings.custom_pinning }}
-          {%- endif %}
-        {%- if model.run_settings.colocated_db_settings['db_scripts'] %}
+          {%- if model.run_settings.colocated_db_settings['db_scripts'] %}
         Torch Scripts:
-        {%- for script in model.run_settings.colocated_db_settings['db_scripts'] %}   
-          Script Name: {{ script.name }}
+        {%- for script in model.run_settings.colocated_db_settings['db_scripts'] %}
+            Script Name: {{ script.name }}
             Script Path: {{ script.script_path }}
-            Backend: {{ script.device }}   
-            Devices Per Node: {{ script.devices_per_node }} 
+            Backend: {{ script.device }}
+            Devices Per Node: {{ script.devices_per_node }}
+
         {%- endfor %}
-    {%- endif %}
-    {%- if model.run_settings.colocated_db_settings['db_models'] %}
-        ML Models: 
+        {%- endif %}
+        {%- if model.run_settings.colocated_db_settings['db_models'] %}
+        ML Models:
         {%- for mlmodel in model.run_settings.colocated_db_settings['db_models'] %}
-          Model Name: {{ mlmodel.name }} 
-            Model Path: {{ mlmodel.model_file }}
+          Model Name: {{ mlmodel.name }}
             Backend: {{ mlmodel.backend }}
-            Device: {{ mlmodel.device }}  
+            Model Path: {{ mlmodel.model_file }}
+            Device: {{ mlmodel.device }}
             Devices Per Node: {{ mlmodel.devices_per_node }}
             {%- if mlmodel.device == "GPU" %}
             First Device: {{ mlmodel.first_device }}
             {%- endif %}
             {%- for input in mlmodel.inputs %}
-            Inputs: 
-              {{ input }} 
+            Inputs:
+              {{ input }}
               {%- endfor %}
               {%- for output in mlmodel.outputs %}
-            Outputs: 
+            Outputs:
               {{ output }}
               {%- endfor %}
-    {%- endfor %}
-    {%- endif %}
-    {%- if model.query_key_prefixing()%}  
+          {%- endfor %}
+          {%- endif %}
+          {%- endif %}
+          {%- if model.query_key_prefixing()%}
         Key Prefix: {{ model.name }}
+        {%- endif %}
     {%- endif %}
-{%- endif %}

templates/templates/preview/orchestrator_plain_text_debug.template

@@ -1,14 +1,27 @@
-        
+
     = Database Identifier: {{ db.name }} =
         Shards: {{ db.num_shards }}
-        TCP/IP Port(s): 
+        TCP/IP Port(s):
           {%- for port in db.ports %}
           {{ port }}
           {%- endfor %}
         Network Interface: {{ db._interfaces[0] }}
         Type: {{ config.database_cli | get_dbtype }}
         Executable: {{ config.database_exe }}
-        Batch Launch: {{ db.batch }}
-        {%- if db.run_command %}
-        Run Command: {{ db.run_command }}
+        {%- if db.batch_settings %}
+        Batch Launch: True
+        Batch Command: {{ db.batch_settings.batch_cmd }}
+        Batch Arguments:
+        {%- for key, value in db.batch_settings.batch_args.items() %}
+          {{ key }}: {{ value }}
+        {%- endfor %}
+        {%- endif -%}
+        {%- if db.run_settings %}
+        Run Command: {{ db.run_settings.run_command }}
+        {%- if db.run_settings.run_args %}
+        Run Arguments:
+        {%- for key, value in db.run_settings.run_args.items() %}
+          {{ key }}: {{ value }}
+        {%- endfor %}
+        {% endif %}
         {%- endif %}

tests/test_preview.py

@@ -126,7 +126,6 @@ def test_orchestrator_preview_render(test_dir, wlmutils, choose_host):
     assert "Network Interface" in output
     assert "Type" in output
     assert "Executable" in output
-    assert "Batch Launch" in output
 
     db_path = _utils.get_db_path()
     if db_path:
@@ -137,7 +136,6 @@ def test_orchestrator_preview_render(test_dir, wlmutils, choose_host):
     assert orc._interfaces[0] in output
     assert db_type in output
     assert CONFIG.database_exe in output
-    assert str(orc.batch) in output
     assert orc.run_command in output
     assert str(orc.db_nodes) in output
 
@@ -154,7 +152,9 @@ def test_preview_to_file(test_dir, wlmutils):
     filename = "test_preview_output_filename.txt"
     path = pathlib.Path(test_dir) / filename
     # Execute preview method
-    exp.preview(output_format="plain_text", output_filename=str(path))
+    exp.preview(
+        output_format="plain_text", output_filename=str(path), verbosity_level="debug"
+    )
 
     # Evaluate output
     assert path.exists()
@@ -345,7 +345,7 @@ def test_preview_multidb_active_infrastructure(wlmutils, test_dir, choose_host):
     assert "Type" in output
     assert "TCP/IP" in output
 
-    exp.stop(orc)
+    exp.stop(db, db2)
 
 
 def test_preview_multidb_active_infrastructure(wlmutils, test_dir, choose_host):
@@ -1326,10 +1326,10 @@ def test_preview_batch_model(fileutils, test_dir, wlmutils):
     preview_manifest = Manifest(model)
 
     # Execute preview method
-    output = previewrenderer.render(exp, preview_manifest)
+    output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug")
 
     assert "Batch Launch: True" in output
-    assert "Batch Commands" in output
+    assert "Batch Command" in output
     assert "Batch Arguments" in output
     assert "nodes" in output
     assert "time" in output
@@ -1362,10 +1362,10 @@ def test_preview_batch_ensemble(fileutils, test_dir, wlmutils):
     preview_manifest = Manifest(ensemble)
 
     # Execute preview method
-    output = previewrenderer.render(exp, preview_manifest)
+    output = previewrenderer.render(exp, preview_manifest, verbosity_level="debug")
 
     assert "Batch Launch: True" in output
-    assert "Batch Commands" in output
+    assert "Batch Command" in output
     assert "Batch Arguments" in output
     assert "nodes" in output
     assert "time" in output