flexmetric 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

flexmetric/metric_process/views.py

@@ -15,32 +15,54 @@ def add_update_metric_route():
     @app.route("/update_metric", methods=["POST"])
     def update_metric():
         try:
-            data = request.get_json()
+            data = request.get_json(force=True)
 
-            # Validate top-level structure
-            if not data or "result" not in data or "labels" not in data or "main_label" not in data:
-                return jsonify({"status": "invalid structure"}), 400
+            # Top-level validation
+            if not isinstance(data, dict):
+                return jsonify({"status": "invalid structure", "error": "Top-level JSON must be an object"}), 400
 
-            result = data["result"]
-            labels = data["labels"]
-            main_label = data["main_label"]
+            required_keys = {"result", "labels", "main_label"}
+            if not required_keys.issubset(data):
+                return jsonify({"status": "invalid structure", "error": f"Missing keys: {required_keys - set(data)}"}), 400
 
-            # Validate types
-            if not isinstance(result, list) or not isinstance(labels, list) or not isinstance(main_label, str):
-                return jsonify({"status": "invalid types"}), 400
+            result = data.get("result")
+            labels = data.get("labels")
+            main_label = data.get("main_label")
 
-            for item in result:
+            # Type validation
+            if not isinstance(result, list) or not all(isinstance(item, dict) for item in result):
+                return jsonify({"status": "invalid result", "error": "Result must be a list of dictionaries"}), 400
+
+            if not isinstance(labels, list) or not all(isinstance(label, str) for label in labels):
+                return jsonify({"status": "invalid labels", "error": "Labels must be a list of strings"}), 400
+
+            if not isinstance(main_label, str) or not main_label.strip():
+                return jsonify({"status": "invalid main_label", "error": "main_label must be a non-empty string"}), 400
+
+            for idx, item in enumerate(result):
                 if "label" not in item or "value" not in item:
-                    return jsonify({"status": "invalid result item"}), 400
-                if not isinstance(item["label"], list):
-                    return jsonify({"status": "label must be list"}), 400
+                    return jsonify({"status": "invalid result item", "error": f"Item {idx} missing 'label' or 'value'"}), 400
+
+                label_values = item["label"]
+                value = item["value"]
+
+                if not isinstance(label_values, list) or not all(isinstance(lv, str) for lv in label_values):
+                    return jsonify({"status": "invalid label", "error": f"Item {idx} 'label' must be list of strings"}), 400
+
+                if len(label_values) != len(labels):
+                    return jsonify({
+                        "status": "label count mismatch",
+                        "error": f"Item {idx} label count ({len(label_values)}) does not match labels length ({len(labels)})"
+                    }), 400
 
-                if len(item["label"]) != len(labels):
-                    return jsonify({"status": "label count mismatch"}), 400
+                try:
+                    float(value)  # Validate numeric value
+                except (ValueError, TypeError):
+                    return jsonify({"status": "invalid value", "error": f"Item {idx} value must be numeric"}), 400
 
-            # If everything is valid, queue the data
+            # If all checks pass, queue the metric
             metric_queue.put(data)
-            print(metric_queue)
+            print("Queued:", data)
 
             return jsonify({"status": "success"}), 200
 

{flexmetric-0.4.0.dist-info → flexmetric-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flexmetric
-Version: 0.4.0
+Version: 0.4.1
 Summary: A secure flexible Prometheus exporter for commands, databases, functions, and scripts.
 Home-page: https://github.com/nikhillingadhal1999/flexmetric
 Author: Nikhil Lingadhal
@@ -138,15 +138,18 @@ https://localhost:5000/update_metric
 
 ### Submitting a Metric to the Flask API
 ```bash
-curl -k -X POST https://localhost:5000/update_metric \
+curl -X POST http://localhost:5000/update_metric \
 -H "Content-Type: application/json" \
 -d '{
   "result": [
-    { "label": "cpu_usage", "value": 42.5 }
+    { 
+      "label": ["cpu", "core_1"], 
+      "value": 42.5 
+    }
   ],
-  "labels": ["cpu"]
+  "labels": ["metric_type", "core"],
+  "main_label": "cpu_usage_metric"
 }'
-
 ```
 
 ### commands.yaml

{flexmetric-0.4.0.dist-info → flexmetric-0.4.1.dist-info}/RECORD

@@ -10,9 +10,9 @@ flexmetric/metric_process/database_processing.py,sha256=hbVbzIdO21NF0F3nILJ4d1x8
 flexmetric/metric_process/expiring_queue.py,sha256=1oC0MjloitPiRo7yDgVarz81ETEQavKI_W-GFUvp5_Y,1920
 flexmetric/metric_process/process_commands.py,sha256=clGMQhLNcuJUO1gElpAS9Dyk0KU5w41DIguczjo7ceA,4089
 flexmetric/metric_process/prometheus_agent.py,sha256=rZ9pQrqA3J_-sJtl48qkFIHIUH01iert05u4SmGN4Yc,7714
-flexmetric/metric_process/views.py,sha256=vdL7PyZ8KRvEn6UM4HUtUZdCufzTL_JkkMEy0J2-4Ng,1939
-flexmetric-0.4.0.dist-info/METADATA,sha256=RQTETb4livHASNzKCDg6N1JOrrzl8skM1rrv2p9vk4g,10498
-flexmetric-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-flexmetric-0.4.0.dist-info/entry_points.txt,sha256=urVePn5EWr3JqNvkYP7OsB_h2_Bqvv-Wq1MJRBexm8A,79
-flexmetric-0.4.0.dist-info/top_level.txt,sha256=zBlrNwKhXUNhgu9RRZnXxYwYnmE-eocRe6wKSmQROA4,11
-flexmetric-0.4.0.dist-info/RECORD,,
+flexmetric/metric_process/views.py,sha256=BY695dCpTkJRc1KLC9RNpFTieFdHeHvyqyefmHhMauE,3297
+flexmetric-0.4.1.dist-info/METADATA,sha256=kHQheeo9qUgtJD6Zyb8O7q6eZR8RTCs7DJXHDJ8Yfrc,10570
+flexmetric-0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+flexmetric-0.4.1.dist-info/entry_points.txt,sha256=urVePn5EWr3JqNvkYP7OsB_h2_Bqvv-Wq1MJRBexm8A,79
+flexmetric-0.4.1.dist-info/top_level.txt,sha256=zBlrNwKhXUNhgu9RRZnXxYwYnmE-eocRe6wKSmQROA4,11
+flexmetric-0.4.1.dist-info/RECORD,,