pryvx 2.4.2__py3-none-any.whl → 2.4.4__py3-none-any.whl

pryvx/fl_client.py

@@ -9,27 +9,28 @@ import pickle
 def train_logistic_classifier(features, labels):
     model = LogisticRegression()
     model.fit(features, labels)
-
     serialized_model = pickle.dumps(model)
+    return serialized_model, model
 
-    return serialized_model
 
 def train_random_forest_classifier(features, labels):
     model = RandomForestClassifier(n_estimators=100, random_state=42)
     model.fit(features, labels)
     serialized_model = pickle.dumps(model)
-
-    return serialized_model
+    return serialized_model, model
 
 
-def send_params(serialized_model, connection_url):
+def send_params(serialized_model, connection_url, client_id):
 
     with grpc.insecure_channel(connection_url) as channel:
         stub = pryvx_pb2_grpc.ModelServiceStub(channel)
 
+        # Attach metadata (client ID) in the request
+        metadata = (("client_id", client_id),)
+
         model_params = pryvx_pb2.ModelParams(params=serialized_model)
 
-        response = stub.SendModelParams(model_params)
+        response = stub.SendModelParams(model_params, metadata=metadata)
 
-        return "Model Params sent to server"
+        return f"✅ Model Params sent to server from {client_id}"
 

pryvx/fl_ensemble.py

@@ -1,16 +1,20 @@
-from sklearn.ensemble import VotingClassifier
-
-# estimators = [('client_1', model_1), ('client_2', model_2), ('client_3', model_3)]
+import numpy as np
 
 def federated_ensemble(estimators, X_test):
-    # Create an ensemble using soft voting
-    ensemble_model = VotingClassifier(
-        estimators=estimators,
-        voting='soft'  # Soft voting (probability-based)
-    )
-
-    # Make predictions
-    y_pred_ensemble = ensemble_model.predict(X_test)
+    """
+    Perform soft voting ensemble on a list of trained estimators.
+    
+    :param estimators: List of trained models that support `predict_proba`
+    :param X_test: Test dataset (features only)
+    :return: Final predictions after soft voting
+    """
+    if not estimators:
+        raise ValueError("No models provided for ensemble.")
 
-    return y_pred_ensemble
+    # Sum all probability predictions
+    avg_probs = sum(model.predict_proba(X_test) for model in estimators) / len(estimators)
 
+    # Convert probabilities to final predictions (highest probability wins)
+    y_pred_ensemble = np.argmax(avg_probs, axis=1)
+    
+    return y_pred_ensemble

pryvx/fl_server.py

@@ -16,26 +16,28 @@ class ModelServicer(pryvx_pb2_grpc.ModelServiceServicer):
 
     def SendModelParams(self, request, context):
         try:
+            # Extract metadata (client ID)
+            client_id = dict(context.invocation_metadata()).get("client_id", "unknown_client")
+            
             # Deserialize model received from client
             model = pickle.loads(request.params)
 
-            timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
-
             # Assign a unique client ID
             client_id = f"client_{len(self.client_models) + 1}"
             self.client_models[client_id] = model
             
             # Save model to disk
-            model_filename = os.path.join(MODEL_SAVE_PATH, f"{client_id}_model_{timestamp}.pkl")
+            model_filename = os.path.join(MODEL_SAVE_PATH, f"{client_id}_model.pkl")
             with open(model_filename, "wb") as f:
+                
                 pickle.dump(model, f)
 
             print(f"✅ Received and saved model from {client_id}")
 
-            return pryvx_pb2.ModelResponse(message=f"Model from {client_id} received and saved.")
+            return f"Model from {client_id} received and saved."
         except Exception as e:
             print(f"❌ Error processing model: {e}")
-            return pryvx_pb2.ModelResponse(message="Failed to process model")
+            return "Failed to process model"
 
 
 def start_server():

{pryvx-2.4.2.dist-info → pryvx-2.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pryvx
-Version: 2.4.2
+Version: 2.4.4
 Summary: A comprehensive package for privacy-enhancing technologies
 Home-page: UNKNOWN
 Author: PryvX (Jayesh Kenaudekar)

{pryvx-2.4.2.dist-info → pryvx-2.4.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 pryvx/__init__.py,sha256=QvpYISJ8MH7XnbxC5iTMTycq7Svsld0NIbMozcndYjo,111
-pryvx/fl_client.py,sha256=axJKdQgXDMs1FT8rgI2HzG8keyEG__U9Y4GtiWWeHO4,986
-pryvx/fl_ensemble.py,sha256=cUPPx3QpnalRKtIBtoE4PCTk34E7940W7ZxGtUisDgo,475
-pryvx/fl_server.py,sha256=bJ_dm-UZvmq-JUB58b_F_V5-IsmB3eC2RS0JjF5CPs8,1739
+pryvx/fl_client.py,sha256=gQNjv99tDDjaGj0JTdAVomefqR2F3_xNLcnHJ6aGZZo,1152
+pryvx/fl_ensemble.py,sha256=lvgvd-zJDSBh-RyMAjTyJZwu0eFiUNXfCU7J2Vk7g0g,715
+pryvx/fl_server.py,sha256=qAuJqOjdTZ9-DZWx6eeVqGtyMhAqcyTe4vutmtSeglE,1756
 pryvx/gdp.py,sha256=ToLtWNvBKtSs-3Na1pGe_J6dWvBxXhV2raUJkNtKMg4,925
 pryvx/ldp.py,sha256=WxBQLnZ_b2wNV1rlN7rtKXaQ5waUPPvnRus-4tUnCB8,810
 pryvx/phe.py,sha256=HN70aUNTq0w9vRPMaNGfTnNi00gMQ1B7R7Cm6r6rheE,2974
@@ -9,8 +9,8 @@ pryvx/pryvx_pb2.py,sha256=-ce40VMW0nQcjyhAJy1BvI32wtWNm425LSIExspK_qg,1200
 pryvx/pryvx_pb2_grpc.py,sha256=pRQKblTNIVEwHsMQmhC-HGJFzsLh0sdOzQ-ksFYVK-A,2437
 pryvx/psi.py,sha256=V0BUJwYfiFWhKtEL27q45yxY7U-I7B4olKQhaGbgN50,1346
 pryvx/smpc.py,sha256=FZcE3gZo8WUVPmcBHSgP8iOkWt3AKcBLSLCtKczy8hs,2247
-pryvx-2.4.2.dist-info/LICENSE,sha256=pbIMXbaorAIVW-fDch2tvtZRkVA3mz-UnXQqeCf4LDg,1086
-pryvx-2.4.2.dist-info/METADATA,sha256=axWXanMU4AAmUsGygBZlLx7BYDT6v6LNqW9pGaw02Rk,1066
-pryvx-2.4.2.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-pryvx-2.4.2.dist-info/top_level.txt,sha256=1iHoeevu_FoFjdPg8HyMlgvHNUm1--9QEpFMaJEa4hw,6
-pryvx-2.4.2.dist-info/RECORD,,
+pryvx-2.4.4.dist-info/LICENSE,sha256=pbIMXbaorAIVW-fDch2tvtZRkVA3mz-UnXQqeCf4LDg,1086
+pryvx-2.4.4.dist-info/METADATA,sha256=oASPQafqbKaThizhvqDZABLarIJz1PO0bs18cBNm3PQ,1066
+pryvx-2.4.4.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+pryvx-2.4.4.dist-info/top_level.txt,sha256=1iHoeevu_FoFjdPg8HyMlgvHNUm1--9QEpFMaJEa4hw,6
+pryvx-2.4.4.dist-info/RECORD,,