hcs-cli 0.1.321__py3-none-any.whl → 0.1.323__py3-none-any.whl

hcs_cli/support/scm/plan_editor.py

@@ -8,10 +8,123 @@ from hcs_cli.support.scm.html_util import show_html
 
 
 def _timestamp_to_date(timestamp: int):
-    return datetime.fromtimestamp(timestamp / 1000).strftime("%Y-%m-%dT%H:%M")
+    return datetime.utcfromtimestamp(timestamp / 1000).strftime("%Y-%m-%dT%H:%M")
 
 
-def edit_plan(plan: dict, template_name: str):
+def _process_usage_data(usage_api: dict, template_name: str):
+    """Process usage API data for the usage chart."""
+    if not usage_api:
+        return None
+
+    x_axis = []
+    consumed_capacity = []
+    spare_capacity = []
+    no_spare_error = []
+    powered_on_vms = []
+    consumed_capacity_predicated = []
+    spare_capacity_predicated = []
+    no_spare_error_predicated = []
+    optimized_capacity = []
+
+    history = usage_api.get("history", {})
+    prediction = usage_api.get("prediction", {})
+    timeslot_ms = usage_api.get("timeslotMs", 0)
+
+    start_timestamp = history.get("startTimestamp", 0)
+    for i in range(len(history.get("maxCapacity", []))):
+        t = start_timestamp + i * timeslot_ms
+        x_axis.append(_timestamp_to_date(t))
+        max_capacity = history["maxCapacity"][i]
+        min_free = history["minFree"][i]
+        consumed_capacity.append(history["poweredOnAssignedVms"][i])
+        spare_capacity.append(max_capacity - consumed_capacity[-1])
+        no_spare_error.append(history["noSpare"][i])
+        # Calculate poweredOnVms = poweredOnAssignedVms + poweredOnUnassignedVms
+        assigned = history.get("poweredOnAssignedVms", [0])[i] if i < len(history.get("poweredOnAssignedVms", [])) else 0
+        unassigned = history.get("poweredOnUnassignedVms", [0])[i] if i < len(history.get("poweredOnUnassignedVms", [])) else 0
+        powered_on_vms.append(assigned + unassigned)
+
+    start_timestamp = prediction.get("startTimestamp", 0)
+    for i in range(len(prediction.get("maxCapacity", []))):
+        t = start_timestamp + i * timeslot_ms
+        x_axis.append(_timestamp_to_date(t))
+        max_capacity = prediction["maxCapacity"][i]
+        min_free = prediction["minFree"][i]
+        ideal_capacity = prediction["idealCapacity"][i]
+        consumed_capacity_predicated.append(ideal_capacity)
+        spare_capacity_predicated.append(min_free)
+        optimized_capacity.append(ideal_capacity)
+        no_spare_error_predicated.append(prediction["noSpare"][i])
+
+    # split_index marks where real data ends and predicted data begins
+    split_index = len(consumed_capacity)
+
+    n = len(consumed_capacity) - 1
+    consumed_capacity_predicated = [0] * n + [consumed_capacity[-1]] + consumed_capacity_predicated
+    spare_capacity_predicated = [0] * n + [0] + spare_capacity_predicated
+    optimized_capacity = [0] * n + [0] + optimized_capacity
+    no_spare_error_predicated = [0] * n + [no_spare_error[-1]] + no_spare_error_predicated
+
+    # Calculate predicated powered on vms based on historical data
+    # Structure: [zeros for historical period] + [predictions for 7 days (336 slots)]
+    # Each week is 336 time slots (48 slots/day * 7 days)
+    # Formula: slot[N] = 0.85 * slot[N-336] + 0.15 * (slot[N-336*2] + slot[N-336*3] + slot[N-336*4]) / 3
+    powered_on_vms_predicated = []
+    total_historical_slots = len(powered_on_vms)
+
+    # First part: zeros for the historical period
+    powered_on_vms_predicated.extend([0] * total_historical_slots)
+
+    # Second part: 7 days of predictions (336 slots)
+    for day_offset in range(7):  # 7 days
+        for slot_in_day in range(48):  # 48 slots per day
+            slot_index = day_offset * 48 + slot_in_day
+
+            # Calculate which slot in the future we're predicting
+            # This is relative to the end of historical data
+            predict_slot = total_historical_slots + slot_index
+
+            # Look back to find corresponding slots from previous weeks
+            weeks_ago_1 = predict_slot - 336
+
+            # Get the value from 1 week ago if available
+            value_1_week = 0
+            if weeks_ago_1 >= 0 and weeks_ago_1 < total_historical_slots:
+                value_1_week = powered_on_vms[weeks_ago_1]
+
+            # Collect values from 2, 3, 4 weeks ago for averaging
+            secondary_values = []
+            for weeks in [2, 3, 4]:
+                weeks_ago = predict_slot - 336 * weeks
+                if weeks_ago >= 0 and weeks_ago < total_historical_slots:
+                    secondary_values.append(powered_on_vms[weeks_ago])
+
+            # Calculate the average of secondary values
+            if secondary_values:
+                avg_secondary = sum(secondary_values) / len(secondary_values)
+            else:
+                avg_secondary = value_1_week
+
+            # Apply formula: 0.85 * week_1_ago + 0.15 * avg(weeks_2_3_4_ago)
+            value = 0.85 * value_1_week + 0.15 * avg_secondary
+            powered_on_vms_predicated.append(value)
+
+    return {
+        "x_axis": x_axis,
+        "consumed_capacity": consumed_capacity,
+        "spare_capacity": spare_capacity,
+        "no_spare_error": no_spare_error,
+        "powered_on_vms": powered_on_vms,
+        "powered_on_vms_predicated": powered_on_vms_predicated,
+        "consumed_capacity_predicated": consumed_capacity_predicated,
+        "spare_capacity_predicated": spare_capacity_predicated,
+        "no_spare_error_predicated": no_spare_error_predicated,
+        "optimized_capacity": optimized_capacity,
+        "split_index": split_index,
+    }
+
+
+def edit_plan(plan: dict, template_name: str, usage_api: dict = None, template_id: str = None, org_id: str = None):
     # Start a local server to host plan-editor3.
     file_path = path.join(path.dirname(__file__), "plan-editor.html.template")
     with open(file_path, "r") as f:
@@ -61,19 +174,31 @@ def edit_plan(plan: dict, template_name: str):
     del usage["prediction"]
     del usage["timeslotMs"]
 
+    # Process usage API data for the usage chart
+    usage_chart_data = _process_usage_data(usage_api, template_name)
+
+    # Format the template ID path
+    template_id_path = ""
+    if org_id and template_id:
+        template_id_path = f"org/{org_id}/pool/{template_id}"
+    elif template_id:
+        template_id_path = template_id
+
     html_template = template.replace(
         html_template,
         {
             "PLAN_DATA": json.dumps(plan),
+            "TEMPLATE_NAME": template_name,
+            "TEMPLATE_ID_PATH": template_id_path,
             "x_axis": x_axis,
             "template_name": template_name,
-            "consumed_capacity": consumed_capacity,
             "spare_capacity": spare_capacity,
             "no_spare_error": no_spare_error,
             "consumed_capacity_predicated": consumed_capacity_predicated,
             "spare_capacity_predicated": spare_capacity_predicated,
             "no_spare_error_predicated": no_spare_error_predicated,
             "optimized_capacity": optimized_capacity,
+            "USAGE_CHART_DATA": json.dumps(usage_chart_data) if usage_chart_data else "null",
         },
         True,
         False,

{hcs_cli-0.1.321.dist-info → hcs_cli-0.1.323.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-cli
-Version: 0.1.321
+Version: 0.1.323
 Summary: Horizon Cloud Service CLI.
 Project-URL: Homepage, https://github.com/euc-eng/hcs-cli
 Project-URL: Bug Tracker, https://github.com/euc-eng/hcs-cli/issues
@@ -14,7 +14,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
-Requires-Dist: hcs-core>=0.1.321
+Requires-Dist: hcs-core>=0.1.323
 Requires-Dist: inquirerpy>=0.3.4
 Requires-Dist: matplotlib>=3.8.0
 Requires-Dist: paho-mqtt>=2.1.0

{hcs_cli-0.1.321.dist-info → hcs_cli-0.1.323.dist-info}/RECORD

@@ -1,13 +1,13 @@
-hcs_cli/__init__.py,sha256=dX6e1kri6Gcqjvlr5u1l5USUlOgjbOKPHS5vP_FG78Y,72
+hcs_cli/__init__.py,sha256=7KW1VRAYQU035f2jaLhiQJVZNuy6DZMC5son4DF-wQQ,72
 hcs_cli/__main__.py,sha256=lwPXLjh1OpOs4doVLJJ6_3XHtC-VqDOXiw45hvAQorM,684
 hcs_cli/main.py,sha256=0NmRcidxNxtJatS_prEKQ4_6bqu-l8UkLhAPOXW3uyc,3537
 hcs_cli/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hcs_cli/cmds/api.py,sha256=IIz-vORyL5EzDOSCOSgdP_6MIjGG6KvinnCkyg8JUpg,7015
+hcs_cli/cmds/api.py,sha256=HhIR3_09twsGvIx861XgGR_GuEQV8pUCtXiJrp2QuUA,6312
 hcs_cli/cmds/inspect.py,sha256=QBhBOkf2mHlGhgAhY9FXCfvViL2p4D3BudoKjyADdfE,659
 hcs_cli/cmds/login.py,sha256=dj42jDrKktt4bUqSD0Xj6Jo9ZSI7M9v9R280YavWpuc,11165
 hcs_cli/cmds/logout.py,sha256=BxU-K1cIkdBpAAp6SGuwEqECL6g20l9CqEcSX-3pZag,744
 hcs_cli/cmds/query.py,sha256=hh1TVeSkvRiB07fqIA3GGpEBtP3XMz5XCmAGTXD7FOM,9302
-hcs_cli/cmds/task.py,sha256=YIZUjDzHZaNCbmAt589Nzp8s7NMsBI7w_a33l109iy8,19564
+hcs_cli/cmds/task.py,sha256=Jup7VS2sNLz98Zc3o-WhZA7HM5RWadvUKiwIOkjWM0s,21572
 hcs_cli/cmds/test.py,sha256=Kkpe3wV3ViRRAKeMO5IBwjTysEsKzZXP46OXNb-GhxE,1309
 hcs_cli/cmds/upgrade.py,sha256=iJYSyxyNBhiss0u605nD6jpYUdoDhjfIeJP98zSeDf4,931
 hcs_cli/cmds/ad/__init__.py,sha256=wC4uftNZRN3bo9SrRHNNE1tzE0x3B1mCXcIzARm73gI,636
@@ -43,7 +43,7 @@ hcs_cli/cmds/auth/user/__init__.py,sha256=a0hkNUCmxpMRnEf0iDRrW0oI2G2S1oCQmMeuqC
 hcs_cli/cmds/auth/user/list.py,sha256=-r-xMjZLrCteXlDgqTZU0F2Uutj1iE72y_LSlp4q9po,1444
 hcs_cli/cmds/clouddriver/__init__.py,sha256=CXJ0wWXJkL89XMNXYkHH7TXkq10TH5JBy8Yhs48PCis,639
 hcs_cli/cmds/clouddriver/provider.py,sha256=EOsJrxnNZwdfHGuUsjDBWOWDj0bR-0ekCAJ4clHZZFw,1373
-hcs_cli/cmds/clouddriver/summary.py,sha256=VbVVTeo4zPjEJhEeWtNpcpcozbRm2gplMpSR3GL_8io,757
+hcs_cli/cmds/clouddriver/service.py,sha256=idNx8ESPTddGL-XDSTeHbBIEJd14UDonr-wbVfAxJQ0,913
 hcs_cli/cmds/clouddriver/task.py,sha256=OWlBvGmwKjveB4Wa7yL13r-EAy4TLU_OGU8mr4Gm6us,1440
 hcs_cli/cmds/credential/__init__.py,sha256=CJEt8JL1o3Iaj8Boq213gTGlpw8_jh9yWyKyKCL6o9M,638
 hcs_cli/cmds/credential/get.py,sha256=IAiYaw5zqQc4WqkKijgabyV8MpXxrZkgY_Cwm5gJ5W4,1079
@@ -235,7 +235,7 @@ hcs_cli/cmds/scm/__init__.py,sha256=qOaaE1aCoIxeA7nRxhI0ZasMEE-KZ9PAfEkTSWdWcHw,
 hcs_cli/cmds/scm/health.py,sha256=c_0wOh3S4sHBLpAbcjvZGOToRjaEQHlyBD44Ry7pmsI,1277
 hcs_cli/cmds/scm/operator.py,sha256=9RQPgx0zHUIJLrJnNEu0rUw2VTD73lY-91iYVJ77Pck,3891
 hcs_cli/cmds/scm/plan.py,sha256=1DauYaO9D8bhBIERNS8WK9k0-BarYN8M8xldGdaHwFQ,16802
-hcs_cli/cmds/scm/template.py,sha256=X33WJPrVCY0P_SRL4BFjNDH8Ax863Fn_uRQdG-1wsTA,1546
+hcs_cli/cmds/scm/template.py,sha256=MkKumBTpWoSz9a-wJMz5TK1wkGO4IDUkSHIxvDacZZM,1717
 hcs_cli/cmds/site/__init__.py,sha256=f5ZuflhKsBw-8TAJ8xWzlw5lnIU8Imba70GIYSzgz-Q,624
 hcs_cli/cmds/site/create.py,sha256=jf3g0h7EBf5AW1Di1Qbl62yt6A_sMXGrcKpiZh0gJAQ,1171
 hcs_cli/cmds/site/delete.py,sha256=7Tq1HaqfsoJxva-XSOa3PKFUKusBUpmg8OkYjwyLlwY,1159
@@ -393,12 +393,13 @@ hcs_cli/provider/hcs/runtime/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 hcs_cli/provider/hcs/runtime/password.py,sha256=_MmoKPUKXUJFjyDv6gSwKOX67XCSZ1DABwSE2HPEEfA,944
 hcs_cli/provider/hcs/runtime/wait_for.py,sha256=uWPQnG3Lb0yEt5DN7TFgQpmxasBLclA15PYFMV5bfds,2320
 hcs_cli/service/__init__.py,sha256=6G9yVufTdwMISCx6OJQQvS14nF9carw6vEmXqHpQmIY,2812
+hcs_cli/service/api.py,sha256=RundRlezi5Z8Id3trTakdsqezVnUEYDWF-MRSVFMBHY,4219
 hcs_cli/service/csp.py,sha256=SkBCcQ3bKETKuc-vs_VtCUu5CRc3FmjauoWIh3uUMB8,954
 hcs_cli/service/edge.py,sha256=KhePkqeSqpumlR0Je_O_8Y-gSnnDEpBd-78aYb3PzLQ,4268
 hcs_cli/service/graphql.py,sha256=Vqt4wMeRSPV_2YhGvb9vs0vlac0_fMAhg1BijKX6reg,468
 hcs_cli/service/pool.py,sha256=EjTENTX5wSZ-YhP8ON_tonB54-OhjWCluzIHVR7ed04,1266
 hcs_cli/service/site.py,sha256=th23Ucm8HgU96Rbt2m8ww2YrISj2Oksojc4atkdjRNM,1568
-hcs_cli/service/task.py,sha256=qqAQPqIS66cBp-f_4zsLm2-iEsWwB6rkBgczDVAlo-Y,9565
+hcs_cli/service/task.py,sha256=F8NsjF2ZJbInmOvp8YzowlampQPU3KvQHlJKxdQ_uHs,9781
 hcs_cli/service/template.py,sha256=pCHmMX8zSdq0RX7bCftVog0_hNQU5gIe2o0FevxpKeg,2796
 hcs_cli/service/uag.py,sha256=5TMt6lqxMVOlp6d49aOZsKFfcgGRdE03Ew4yVWwbw7Q,3747
 hcs_cli/service/vm.py,sha256=9yfG_B8omd6lkXEvLbOd1tpFc_j-P40Y5aZG-_-TeC4,5398
@@ -420,8 +421,9 @@ hcs_cli/service/av/app.py,sha256=VmUvBzTLoGzpW8G_M40MTcdEnNPXlUW33YLjZHpE9Pg,184
 hcs_cli/service/av/avimport.py,sha256=TImptsWHgo1MIv-S7UJCCZANd7kSsx_vzF8cnugORd4,2313
 hcs_cli/service/av/entitlements.py,sha256=BqM3HxQayUOEegKPhHytBUsD8OMyIIFx-L7KzxQSFLY,1550
 hcs_cli/service/av/fileshare.py,sha256=i8YpFevp8no-JZP9dqK8y1feGdwWZR8KelZqM-G7pEo,1753
-hcs_cli/service/clouddriver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hcs_cli/service/clouddriver/__init__.py,sha256=WXsp49ivOll5PqIVKYbBVJmK3S5giiMoCm08J1UuTNQ,76
 hcs_cli/service/clouddriver/provider.py,sha256=PgAqYdZe-mlsE6iZ2lJuNTxkwxhhL4DE5q36X09rqVI,1344
+hcs_cli/service/clouddriver/service.py,sha256=QF-ScexqS1zgpKiw4Oa_CBLZnZIwytr0uU9FaOAA9lQ,899
 hcs_cli/service/credential/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hcs_cli/service/credential/credential.py,sha256=MINXDWGJJ9k_BNixpJGC1uGWhADLCSQuFdGLUPA1Rio,798
 hcs_cli/service/credential/nls.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -493,9 +495,9 @@ hcs_cli/support/test_utils2.py,sha256=g321d4lNbJfy8VaSfwWjlj4_ZJe9NW6B16S8GOT3rE
 hcs_cli/support/use_util.py,sha256=QBrcNIW-k0g41euTc7-oU1WKEmACJx3YGQflyC3YeFs,2970
 hcs_cli/support/vm_table.py,sha256=hqNUKLVUuBiuDwlqcAQ7uAT1-4z6ZYOIGRcFWn8lnAo,2329
 hcs_cli/support/scm/html_util.py,sha256=clgMpM90HxRRs3D9ORYYNB57AYh7y_-UzJrB4KX3dsY,458
-hcs_cli/support/scm/plan-editor.html.template,sha256=qXhHYjBsG8uaVlMkc0gnCePoSV3w5NyTkaLhXV9jlC0,26874
-hcs_cli/support/scm/plan_editor.py,sha256=pZtm9X_R-vs2JxJ_NX7-wTAoY-nhI-gFqhcyVDdEZVM,3108
-hcs_cli-0.1.321.dist-info/METADATA,sha256=llYPP2ShA7g1sBAPChU2L8BaF62Yq0ozSKHZ0xFVieQ,3614
-hcs_cli-0.1.321.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-hcs_cli-0.1.321.dist-info/entry_points.txt,sha256=5uH-af1WUETSBSer2bu4YMGQNY5RriJHsjepb8ACiX8,42
-hcs_cli-0.1.321.dist-info/RECORD,,
+hcs_cli/support/scm/plan-editor.html.template,sha256=HtXMmvIvTixVEYN1gblCeqFTt_F8JF6ltDC11Eb_GMw,46975
+hcs_cli/support/scm/plan_editor.py,sha256=TxfHyyozoQ_DCyaPrYXFG9n8AnBuUD8753009FUD0GU,8722
+hcs_cli-0.1.323.dist-info/METADATA,sha256=b-2W82xpVCj8-96cj5dRQJYZuRH3zlCnqPQru2H9hJU,3614
+hcs_cli-0.1.323.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hcs_cli-0.1.323.dist-info/entry_points.txt,sha256=5uH-af1WUETSBSer2bu4YMGQNY5RriJHsjepb8ACiX8,42
+hcs_cli-0.1.323.dist-info/RECORD,,