update to use get_opendss_model

Signed-off-by: vince <vince.white@zepben.com>

Author: vincewhite

setup.py

@@ -20,7 +20,7 @@
     package_dir={'': 'src'},
     python_requires='>=3.9, <3.13',
     install_requires=[
-        "zepben.eas==0.18.0",
+        "zepben.eas==0.19.0",
         "zepben.evolve==0.45.0",
         "numba==0.60.0",
         "geojson==2.5.0",

src/zepben/examples/export_open_dss_model.py

@@ -20,24 +20,26 @@ def wait_for_export(eas_client: EasClient, model_id: int):
     total = 0
     print(f"Waiting for model generation ({wait_limit_seconds} seconds) ", end='')
     # Retrieve the model information for the model we just requested
-    get_result = eas_client.get_paged_opendss_models()
-    model = next(x for x in get_result["data"]["pagedOpenDssModels"]["models"] if x["id"] == model_id)
+    model = eas_client.get_opendss_model(model_id)
     while model["state"] != "COMPLETED":
-        get_result = eas_client.get_paged_opendss_models()
-        model = next(x for x in get_result["data"]["pagedOpenDssModels"]["models"] if x["id"] == model_id)
+        model = eas_client.get_opendss_model(model_id)
         print(".", end='')
         sleep(step_seconds)
         total += step_seconds
         if total > wait_limit_seconds:
             raise TimeoutError("Timed out waiting for model export to complete.")
 
 
-def download_generated_model(eas_client: EasClient, model_id: int):
+def download_generated_model(eas_client: EasClient, output_file_name: str, model_id: int):
     url = eas_client.get_opendss_model_download_url(model_id)
+    if url == f'Model with id {model_id} is still being created':
+        print(url)
+        print("Download failed.")
+        return
 
     print(f"\nURL (30 second expiry): {url}", )
 
-    file_name = f"Opendss_export_output_model_{model_id}.zip"
+    file_name = f"{output_file_name}-{model_id}.zip"
     print(f"Downloading model zip to: {file_name}")
 
     try:
@@ -51,23 +53,22 @@ def download_generated_model(eas_client: EasClient, model_id: int):
 
 def test_open_dss_export(export_file_name: str):
     eas_client = EasClient(
-        "staging.dev.zb.energy",
+        "<EAS_HOSTNAME>",
         443,
-        verify_certificate=True,
-        access_token="eyJraWQiOiI2ZDFiZGMxOS00MDEyLTQ4NzAtYjIzNy1lZTFlY2NkNTBiOTYiLCJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsiNjU2ZWRiYWMtYzE0OS00NGFlLWIwODctYzMyYTA4Y2M4N2QwIiwiNmI5OTkzNTItMmIwZi00YTJkLThkMGMtYTI4YWExMWM1OTY2Il0sImlzcyI6Imh0dHBzOi8vc3RhZ2luZy5kZXYuemIuZW5lcmd5IiwiaWF0IjoxNzUyMjAxNzExLCJuYmYiOjE3NTIyMDE3MTEsImV4cCI6MTc1NDc5MzcxMSwidGtuIjoib3BlbmRzc19leHBvcnQiLCJyb2xlcyI6WyJTVVBFUl9BRE1JTiIsInJlYWQ6ZXdiIiwid3JpdGU6ZXdiIiwicmVhZDpjdXN0b21lciIsInJlYWQ6ZGlhZ3JhbSJdLCJuYW1lIjoiMzRiYjBjN2YtYjFiOS00Zjc4LTk4M2YtMjkyMzhjNzBiZGE5IiwiZW1haWwiOiJ2aW5jZS53aGl0ZUB6ZXBiZW4uY29tIiwic3ViIjoiMzRiYjBjN2YtYjFiOS00Zjc4LTk4M2YtMjkyMzhjNzBiZGE5Iiwib3JpZ2luYWxfcHJvdmlkZXIiOiJlbnRyYWlkIiwia3R5cCI6InVzZXIiLCJ2ZXIiOiIxLjAiLCJqdGkiOiIyM2NjMDEyOC1jOTIwLTRhZTgtYmFkNS05ODczNDkwZTE2MWYifQ.kufOk6UJpFPFXZesfm37141suiB9wy1_MBErvkJZ6junReOveXyhMm86KcO_T1cq-RLjqZVXA9KBy33J8B4HZbes7uMfVSevyRefeIAbVigjSjONjGNPz4xRRpCtk52NHfdqG8nfWCR8zOaupqVzzXCYe2JXKQRQcQ7uW1dJ7_bHpoCA4ZkNYsDINY8avVq1o7KdXqRks9OwTq2WGkIyxWm2dmO69EGd4-23E2difD418oPKjgKKGhljm8uKyW2FzwZ5vgzwuBVOPLzRsmUhimqyAtbrXQRsQyrb9x5uIt4qxrHsRXiL4aAti4alKI2hMdAadqAQ4YNXkMq00loDNK89vdGSnATLuVrOCBEpU4B2WYqIP9pJXrFnoAkHP7dZuChUjNM_oPRy7c0hQcHgmry_2g7jgr05Am58ngKIPahuHSEyHIUO9fER3U8-CX1pihfVsEdkc93KREQOr-ZrB1ivnIkp6wzFc9y3YHRVkA7Gpne7aOBA3vqlzzJEUyYb0xv82E023MJlgT7fpPrlzdO4bVTT-RfZBZ8DKRs3jiLQ4oqIVUDzptHln3CIoL0sFec3Mg3DaHWTU3jQ7IHdJ2T3n6CZyr3jNfkOa3yaUApf7WP-hoA-BeJGyKz056WovOy6BdAcnm5a3XwB-ODPlkD6ZtulVvtVy2ClhuK1QM8"
+        access_token="<PERSONAL_ACCESS_TOKEN>"
     )
 
     # Run an opendss export
     print("Sending OpenDss model export request to EAS")
 
     response = eas_client.run_opendss_export(
         OpenDssConfig(
-            scenario="1",
+            scenario="Base",
             year=2024,
-            feeder="WD24",
+            feeder="<FEEDER_ID>",
             load_time=TimePeriod(
-                datetime.strptime("2022-04-01T00:00:00", "%Y-%m-%dT%H:%M:%S"),
-                datetime.strptime("2023-04-01T00:00:00", "%Y-%m-%dT%H:%M:%S")
+                datetime.strptime("2024-04-01T00:00:00", "%Y-%m-%dT%H:%M:%S"),
+                datetime.strptime("2025-04-01T00:00:00", "%Y-%m-%dT%H:%M:%S")
             ),
             generator_config=GeneratorConfig(
                 model=ModelConfig(
@@ -112,7 +113,7 @@ def test_open_dss_export(export_file_name: str):
         wait_for_export(eas_client, int(model_id))
 
         # Request a download URL from EAS and download to a local file
-        download_generated_model(eas_client, int(model_id))
+        download_generated_model(eas_client, export_file_name, int(model_id))
 
     except TimeoutError:
         print("\nERROR: Timed out waiting for model export to complete.")
@@ -121,4 +122,4 @@ def test_open_dss_export(export_file_name: str):
 
 
 if __name__ == "__main__":
-    test_open_dss_export("monday_test")
+    test_open_dss_export("test_export-model")