From 7c4211dc0e0499a0134f05d46fec8e858f10e5f3 Mon Sep 17 00:00:00 2001 From: Uriah Finkel Date: Sun, 30 Nov 2025 18:06:02 +0200 Subject: [PATCH 1/3] fix: close #216 --- src/rtichoke/__init__.py | 6 +- src/rtichoke/calibration/calibration.py | 60 ++++++++++--------- .../send_post_request_to_r_rtichoke.py | 7 ++- 3 files changed, 38 insertions(+), 35 deletions(-) diff --git a/src/rtichoke/__init__.py b/src/rtichoke/__init__.py index 67e35b5..c60435b 100644 --- a/src/rtichoke/__init__.py +++ b/src/rtichoke/__init__.py @@ -20,9 +20,9 @@ from rtichoke.discrimination.gains import create_gains_curve as create_gains_curve from rtichoke.discrimination.gains import plot_gains_curve as plot_gains_curve -from rtichoke.calibration.calibration import ( - create_calibration_curve as create_calibration_curve, -) +# from rtichoke.calibration.calibration import ( +# create_calibration_curve as create_calibration_curve, +# ) from rtichoke.utility.decision import create_decision_curve as create_decision_curve from rtichoke.utility.decision import plot_decision_curve as plot_decision_curve diff --git a/src/rtichoke/calibration/calibration.py b/src/rtichoke/calibration/calibration.py index d2a8820..f9d32f3 100644 --- a/src/rtichoke/calibration/calibration.py +++ b/src/rtichoke/calibration/calibration.py @@ -3,11 +3,12 @@ """ from typing import Any, Dict, List, Optional -import pandas as pd + +# import pandas as pd import plotly.graph_objects as go from plotly.subplots import make_subplots from plotly.graph_objs._figure import Figure -from rtichoke.helpers.send_post_request_to_r_rtichoke import send_requests_to_rtichoke_r +# from rtichoke.helpers.send_post_request_to_r_rtichoke import send_requests_to_rtichoke_r def create_calibration_curve( @@ -52,38 +53,39 @@ def create_calibration_curve( Returns: Figure: _description_ """ + pass - rtichoke_response = send_requests_to_rtichoke_r( - dictionary_to_send={ - "probs": probs, - "reals": reals, - "size": size, - "color_values ": color_values, - }, - url_api=url_api, - endpoint="create_calibration_curve_list", - ) + # rtichoke_response = send_requests_to_rtichoke_r( + # dictionary_to_send={ + # "probs": probs, + # "reals": reals, + # "size": size, + # "color_values ": color_values, + # }, + # url_api=url_api, + # endpoint="create_calibration_curve_list", + # ) - calibration_curve_list = rtichoke_response.json() + # calibration_curve_list = rtichoke_response.json() - calibration_curve_list["deciles_dat"] = pd.DataFrame.from_dict( - calibration_curve_list["deciles_dat"] - ) - calibration_curve_list["smooth_dat"] = pd.DataFrame.from_dict( - calibration_curve_list["smooth_dat"] - ) - calibration_curve_list["reference_data"] = pd.DataFrame.from_dict( - calibration_curve_list["reference_data"] - ) - calibration_curve_list["histogram_for_calibration"] = pd.DataFrame.from_dict( - calibration_curve_list["histogram_for_calibration"] - ) + # calibration_curve_list["deciles_dat"] = pd.DataFrame.from_dict( + # calibration_curve_list["deciles_dat"] + # ) + # calibration_curve_list["smooth_dat"] = pd.DataFrame.from_dict( + # calibration_curve_list["smooth_dat"] + # ) + # calibration_curve_list["reference_data"] = pd.DataFrame.from_dict( + # calibration_curve_list["reference_data"] + # ) + # calibration_curve_list["histogram_for_calibration"] = pd.DataFrame.from_dict( + # calibration_curve_list["histogram_for_calibration"] + # ) - calibration_curve = create_plotly_curve_from_calibration_curve_list( - calibration_curve_list=calibration_curve_list, calibration_type=calibration_type - ) + # calibration_curve = create_plotly_curve_from_calibration_curve_list( + # calibration_curve_list=calibration_curve_list, calibration_type=calibration_type + # ) - return calibration_curve + # return calibration_curve def create_plotly_curve_from_calibration_curve_list( diff --git a/src/rtichoke/helpers/send_post_request_to_r_rtichoke.py b/src/rtichoke/helpers/send_post_request_to_r_rtichoke.py index 25cc86b..aaca6f3 100644 --- a/src/rtichoke/helpers/send_post_request_to_r_rtichoke.py +++ b/src/rtichoke/helpers/send_post_request_to_r_rtichoke.py @@ -2,7 +2,7 @@ A module for sending post requests to rtichoke r api """ -import requests +# import requests import pandas as pd from rtichoke.helpers.exported_functions import create_plotly_curve @@ -18,9 +18,10 @@ def send_requests_to_rtichoke_r(dictionary_to_send, url_api, endpoint): Returns: _type_: _description_ """ - rtichoke_response = requests.post(f"{url_api}{endpoint}", json=dictionary_to_send) + pass + # rtichoke_response = requests.post(f"{url_api}{endpoint}", json=dictionary_to_send) - return rtichoke_response + # return rtichoke_response def create_rtichoke_curve( From d060170bf899a9aa16187b972f6f3a69f22c4a58 Mon Sep 17 00:00:00 2001 From: Uriah Finkel Date: Sun, 30 Nov 2025 18:07:04 +0200 Subject: [PATCH 2/3] build: bump version --- pyproject.toml | 2 +- uv.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f4993bb..cc2e44f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ dependencies = [ "marimo>=0.17.0", ] name = "rtichoke" -version = "0.1.20" +version = "0.1.21" description = "interactive visualizations for performance of predictive models" readme = "README.md" diff --git a/uv.lock b/uv.lock index c9d7d02..002fd13 100644 --- a/uv.lock +++ b/uv.lock @@ -3772,7 +3772,7 @@ wheels = [ [[package]] name = "rtichoke" -version = "0.1.20" +version = "0.1.21" source = { editable = "." } dependencies = [ { name = "marimo", version = "0.17.6", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10'" }, From 4a8423f138df4d4c0c8441fd1f8a33cd273e1a65 Mon Sep 17 00:00:00 2001 From: Uriah Finkel Date: Sun, 30 Nov 2025 18:09:25 +0200 Subject: [PATCH 3/3] fix: temporary comment out calibration curve documentation --- docs/_quarto.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/_quarto.yml b/docs/_quarto.yml index adc9a8e..bd9da8e 100644 --- a/docs/_quarto.yml +++ b/docs/_quarto.yml @@ -21,10 +21,10 @@ quartodoc: contents: - prepare_performance_data - prepare_performance_data_times - - title: Calibration - desc: Functions for Calibration. - contents: - - create_calibration_curve + # - title: Calibration + # desc: Functions for Calibration. + # contents: + # - create_calibration_curve - title: Discrimination desc: Functions for Discrimination. contents: