flexmetric 0.4.0__tar.gz → 0.4.1__tar.gz

{flexmetric-0.4.0 → flexmetric-0.4.1}/PKG-INFO

@@ -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 → flexmetric-0.4.1}/README.md

@@ -105,15 +105,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.1/flexmetric/metric_process/views.py

@@ -0,0 +1,76 @@
+from flask import Flask, request, jsonify, Response
+from flexmetric.metric_process.expiring_queue import metric_queue
+import argparse
+from prometheus_client import generate_latest, REGISTRY, CONTENT_TYPE_LATEST
+
+app = Flask(__name__)
+
+
+@app.route('/metrics')
+def metrics():
+    return Response(generate_latest(REGISTRY), mimetype=CONTENT_TYPE_LATEST)
+
+
+def add_update_metric_route():
+    @app.route("/update_metric", methods=["POST"])
+    def update_metric():
+        try:
+            data = request.get_json(force=True)
+
+            # Top-level validation
+            if not isinstance(data, dict):
+                return jsonify({"status": "invalid structure", "error": "Top-level JSON must be an object"}), 400
+
+            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
+
+            result = data.get("result")
+            labels = data.get("labels")
+            main_label = data.get("main_label")
+
+            # 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", "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
+
+                try:
+                    float(value)  # Validate numeric value
+                except (ValueError, TypeError):
+                    return jsonify({"status": "invalid value", "error": f"Item {idx} value must be numeric"}), 400
+
+            # If all checks pass, queue the metric
+            metric_queue.put(data)
+            print("Queued:", data)
+
+            return jsonify({"status": "success"}), 200
+
+        except Exception as e:
+            return jsonify({"status": "error", "message": str(e)}), 500
+
+
+def run_flask(host, port):
+    app.run(host=host, port=port)
+def secure_flask_run(args):
+    app.run(host=args.host, port=args.port, ssl_context=(args.ssl_cert, args.ssl_key))

{flexmetric-0.4.0 → flexmetric-0.4.1}/flexmetric.egg-info/PKG-INFO

@@ -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 → flexmetric-0.4.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="flexmetric",
-    version="0.4.0",
+    version="0.4.1",
     author="Nikhil Lingadhal",
     description="A secure flexible Prometheus exporter for commands, databases, functions, and scripts.",
     long_description=open("README.md").read(),

flexmetric-0.4.0/flexmetric/metric_process/views.py

@@ -1,54 +0,0 @@
-from flask import Flask, request, jsonify, Response
-from flexmetric.metric_process.expiring_queue import metric_queue
-import argparse
-from prometheus_client import generate_latest, REGISTRY, CONTENT_TYPE_LATEST
-
-app = Flask(__name__)
-
-
-@app.route('/metrics')
-def metrics():
-    return Response(generate_latest(REGISTRY), mimetype=CONTENT_TYPE_LATEST)
-
-
-def add_update_metric_route():
-    @app.route("/update_metric", methods=["POST"])
-    def update_metric():
-        try:
-            data = request.get_json()
-
-            # 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
-
-            result = data["result"]
-            labels = data["labels"]
-            main_label = data["main_label"]
-
-            # Validate types
-            if not isinstance(result, list) or not isinstance(labels, list) or not isinstance(main_label, str):
-                return jsonify({"status": "invalid types"}), 400
-
-            for item in 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
-
-                if len(item["label"]) != len(labels):
-                    return jsonify({"status": "label count mismatch"}), 400
-
-            # If everything is valid, queue the data
-            metric_queue.put(data)
-            print(metric_queue)
-
-            return jsonify({"status": "success"}), 200
-
-        except Exception as e:
-            return jsonify({"status": "error", "message": str(e)}), 500
-
-
-def run_flask(host, port):
-    app.run(host=host, port=port)
-def secure_flask_run(args):
-    app.run(host=args.host, port=args.port, ssl_context=(args.ssl_cert, args.ssl_key))