hcs-cli 0.1.322__tar.gz → 0.1.323__tar.gz

{hcs_cli-0.1.322 → hcs_cli-0.1.323}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-cli
-Version: 0.1.322
+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.322
+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.322 → hcs_cli-0.1.323}/hcs_cli/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.1.322"
+__version__ = "0.1.323"
 
 from . import service as service  # noqa: F401

{hcs_cli-0.1.322 → hcs_cli-0.1.323}/hcs_cli/cmds/scm/template.py

@@ -28,16 +28,16 @@ def template(id: str, org: str, **kwargs):
     """Calendar plan for template."""
 
     org_id = cli.get_org_id(org)
-    id = recent.require("template", id)
+    template_id = recent.require("template", id)
 
     # get plan for the template
 
-    plan_id = f"CapacityOptimization-{id}"
+    plan_id = f"CapacityOptimization-{template_id}"
     plan = hcs.scm.plan.get(id=plan_id, org_id=org_id)
     if not plan:
         return None, 1
 
-    template_data = hcs.template.get(org_id=org_id, id=id)
+    template_data = hcs.template.get(org_id=org_id, id=template_id)
 
     plan["meta"]["maxCapacity"] = template_data["sparePolicy"]["limit"]
     calendar = plan["calendar"]
@@ -46,6 +46,6 @@ def template(id: str, org: str, **kwargs):
         calendar[key]["idealCapacity"] = calendar[key]["forecastCapacity"]
 
     # fetch usage data for the usage chart
-    usage = hcs.scm.template_usage(org_id, id)
+    usage = hcs.scm.template_usage(org_id, template_id)
 
-    edit_plan(plan, template_data["name"], usage)
+    edit_plan(plan, template_data["name"], usage, template_id, org_id)

{hcs_cli-0.1.322 → hcs_cli-0.1.323}/hcs_cli/support/scm/plan-editor.html.template

@@ -303,13 +303,13 @@
       <button class="tab-button active" data-tab="usage">Usage</button>
       <button class="tab-button" data-tab="capacity">Capacity</button>
       <button class="tab-button" data-tab="configuration">Configuration</button>
-      <button class="tab-button" data-tab="data">Data</button>
     </div>
 
     <div class="tab-content active" id="usage-tab">
       <div style="margin-bottom: 10px; display: flex; justify-content: flex-end; align-items: center; gap: 10px;">
         <button id="reset-chart-zoom" style="padding: 6px 12px; background-color: #f0f0f0; border: 1px solid #ccc; border-radius: 4px; cursor: pointer; font-size: 12px; display: none;">Reset Time Range</button>
         <span id="selection-info" style="font-size: 12px; color: #666; font-weight: 500;">All timepoints</span>
+        <button class="copy-button" id="copy-data">Copy Data</button>
       </div>
       <div style="width: 100%; height: 400px; position: relative;">
         <div id="usage-chart" style="width: 100%; height: 100%; cursor: crosshair;"></div>
@@ -328,11 +328,6 @@
       <button class="copy-button" id="copy-config">Copy to Clipboard</button>
       <div class="code-container" id="config-json"></div>
     </div>
-
-    <div class="tab-content" id="data-tab">
-      <button class="copy-button" id="copy-data">Copy to Clipboard</button>
-      <div class="code-container" id="chart-data-json"></div>
-    </div>
   </div>
 </div>
 
@@ -845,6 +840,7 @@
       spare_capacity: usageChartData.spare_capacity,
       no_spare_error: usageChartData.no_spare_error,
       powered_on_vms: usageChartData.powered_on_vms,
+      powered_on_vms_predicated: usageChartData.powered_on_vms_predicated,
       consumed_capacity_predicated: usageChartData.consumed_capacity_predicated,
       spare_capacity_predicated: usageChartData.spare_capacity_predicated,
       no_spare_error_predicated: usageChartData.no_spare_error_predicated,
@@ -861,6 +857,7 @@
       chartData.spare_capacity = chartData.spare_capacity.slice(startIdx, endIdx + 1);
       chartData.no_spare_error = chartData.no_spare_error.slice(startIdx, endIdx + 1);
       chartData.powered_on_vms = chartData.powered_on_vms.slice(startIdx, endIdx + 1);
+      chartData.powered_on_vms_predicated = chartData.powered_on_vms_predicated.slice(startIdx, endIdx + 1);
       chartData.consumed_capacity_predicated = chartData.consumed_capacity_predicated.slice(startIdx, endIdx + 1);
       chartData.spare_capacity_predicated = chartData.spare_capacity_predicated.slice(startIdx, endIdx + 1);
       chartData.no_spare_error_predicated = chartData.no_spare_error_predicated.slice(startIdx, endIdx + 1);
@@ -892,7 +889,7 @@
     const option = {
       animation: false,
       title: {
-        text: "Template Usage"
+        text: "Capacity Details: {{TEMPLATE_NAME}} ({{TEMPLATE_ID_PATH}})"
       },
       tooltip: {
         trigger: 'axis',
@@ -925,6 +922,20 @@
             splitIndex = usageChartData.x_axis.length;
           }
 
+          // Adjust splitIndex if we're viewing a filtered time range
+          if (currentFilteredStartIdx !== null && currentFilteredEndIdx !== null) {
+            const startIdx = Math.min(currentFilteredStartIdx, currentFilteredEndIdx);
+            const endIdx = Math.max(currentFilteredStartIdx, currentFilteredEndIdx);
+
+            // Adjust the split point relative to the filtered data
+            splitIndex = Math.max(0, splitIndex - startIdx);
+
+            // If the split point is beyond the filtered range, all data is predicated
+            if (splitIndex > (endIdx - startIdx + 1)) {
+              splitIndex = endIdx - startIdx + 1;
+            }
+          }
+
           const isInPredicatedArea = dataIndex >= splitIndex;
 
           // Filter series based on which area we're in
@@ -962,6 +973,7 @@
           'Spare Capacity',
           'Consumed Capacity',
           "No-spare Error",
+          'Powered On VMs - Predicated',
           'Spare Capacity - Predicated',
           'Consumed Capacity - Predicated',
           "No-spare Error - Predicated",
@@ -973,6 +985,7 @@
           'Spare Capacity': true,
           'No-spare Error': true,
           'Optimized Capacity': true,
+          'Powered On VMs - Predicated': true,
           'Spare Capacity - Predicated': false,
           'Consumed Capacity - Predicated': false,
           'No-spare Error - Predicated': true
@@ -1086,6 +1099,18 @@
           color: '#d66',
           data: chartData.no_spare_error_predicated,
         },
+        {
+          name: 'Powered On VMs - Predicated',
+          type: 'line',
+          lineStyle: { width: 1 },
+          symbolSize: 0,
+          stack: false,
+          emphasis: {
+            focus: 'none'
+          },
+          color: '#ff2222',
+          data: chartData.powered_on_vms_predicated
+        },
         {
           name: 'Optimized Capacity',
           type: 'line',
@@ -1124,15 +1149,9 @@
         const timezone = document.getElementById('timezone-select').value;
         renderUsageChart(currentFilteredStartIdx, currentFilteredEndIdx, timezone);
       }
-
-      // Display chart data when switching to data tab
-      if (button.dataset.tab === 'data') {
-        displayChartData();
-      }
     });
   });
 
-  // Initialize timezone selector
   document.addEventListener('DOMContentLoaded', () => {
     // Detect and display browser timezone
     const browserTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;

{hcs_cli-0.1.322 → hcs_cli-0.1.323}/hcs_cli/support/scm/plan_editor.py

@@ -8,7 +8,7 @@ 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 _process_usage_data(usage_api: dict, template_name: str):
@@ -65,12 +65,57 @@ def _process_usage_data(usage_api: dict, template_name: str):
     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,
@@ -79,7 +124,7 @@ def _process_usage_data(usage_api: dict, template_name: str):
     }
 
 
-def edit_plan(plan: dict, template_name: str, usage_api: dict = None):
+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:
@@ -132,10 +177,19 @@ def edit_plan(plan: dict, template_name: str, usage_api: dict = None):
     # 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,
             "spare_capacity": spare_capacity,

{hcs_cli-0.1.322 → hcs_cli-0.1.323}/pyproject.toml

@@ -21,7 +21,7 @@ keywords = [
 ]
 dynamic = ["version"]
 dependencies = [
-    "hcs-core>=0.1.322",
+    "hcs-core>=0.1.323",
     "reportlab>=4.0.0",
     "matplotlib>=3.8.0",
     "InquirerPy>=0.3.4",