Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docs/_quarto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions src/rtichoke/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
60 changes: 31 additions & 29 deletions src/rtichoke/calibration/calibration.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
7 changes: 4 additions & 3 deletions src/rtichoke/helpers/send_post_request_to_r_rtichoke.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.