tyba-client 0.4.18__py3-none-any.whl → 0.5.0__py3-none-any.whl

tyba_client/__init__.py

@@ -1 +1,4 @@
-__version__ = "0.4.0"
+from importlib.metadata import version
+
+
+__version__ = version("tyba-client")

tyba_client/client.py

@@ -393,16 +393,6 @@ class Client(object):
         url = "get-status/" + run_id
         return self.get(url)
 
-    def get_status_v1(self, run_id: str):
-        """`Deprecated, please use` :meth:`get_status`, `which will support additional results schemas in the near
-        future`. Identical to :meth:`get_status`, but returns results for completed simulations in the "V1"
-        SLD-style schema
-
-        :param run_id: ID of the scheduled model simulation
-        :return: :class:`~requests.Response` containing a JSON object with schema :class:`ModelStatus` (except with a
-          different schema for :attr:`~ModelStatus.result`)
-        """
-        return self.get(f"get-status/{run_id}", params={"fmt": "v1"})
 
     @staticmethod
     def _wait_on_result(
@@ -442,24 +432,6 @@ class Client(object):
             run_id, wait_time, log_progress, getter=self.get_status
         )
 
-    def wait_on_result_v1(
-        self, run_id: str, wait_time: int = 5, log_progress: bool = False
-    ):
-        """`Deprecated, please use :meth:`wait_on_result`, which will support additional results schemas in the near
-        future`. Identical to :meth:`wait_on_result`, but returns results for completed simulations in the "V1"
-        SLD-style schema
-
-        :param run_id: ID of the scheduled model simulation
-        :param wait_time: time in seconds to wait between polling/updates
-        :param log_progress: indicate whether updates/progress should be logged/displayed. If ``True``, will
-          report both :attr:`~ModelStatus.status` and :attr:`~ModelStatus.progress` information
-        :return: results dictionary with "V1" SLD-style schema
-        """
-        res = self._wait_on_result(
-            run_id, wait_time, log_progress, getter=self.get_status_v1
-        )
-        return parse_v1_result(res)
-
 
 def parse_v1_result(res: dict):
     """:meta private:"""

tyba_client/operations.py

@@ -3,7 +3,9 @@ import json
 from datetime import date
 from typing import Optional, Literal
 
-from tyba_client.models import ValidationError
+
+class ValidationError(ValueError):
+    pass
 
 
 class Operations(object):

{tyba_client-0.4.18.dist-info → tyba_client-0.5.0.dist-info}/METADATA

@@ -1,27 +1,21 @@
 Metadata-Version: 2.3
 Name: tyba-client
-Version: 0.4.18
+Version: 0.5.0
 Summary: A Python API client for the Tyba Public API
 License: MIT
 Author: Tyler Nisonoff
 Author-email: tyler@tybaenergy.com
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: dataclasses-json (>=0.6.4,<0.7.0)
-Requires-Dist: generation-models (>=0.10.6,<0.11.0)
-Requires-Dist: marshmallow (>=3.12.1,<4.0.0)
-Requires-Dist: pandas (>=1.3.2,<2.0.0) ; python_version < "3.9"
-Requires-Dist: pandas (>=2.0.0,<3.0.0) ; python_version >= "3.9"
-Requires-Dist: pydantic (>=2.10.6,<3.0.0)
-Requires-Dist: requests (>=2.25.1,<3.0.0)
-Requires-Dist: structlog (>=24.1.0,<25.0.0)
+Requires-Dist: generation-models (>=0.10.8,<0.11.0)
+Requires-Dist: pandas (>=2.3.2,<3.0.0)
+Requires-Dist: requests (>=2.32.5,<3.0.0)
+Requires-Dist: structlog (>=25.4.0,<26.0.0)
 Description-Content-Type: text/markdown
 
 <h1 align="center">

tyba_client-0.5.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+tyba_client/__init__.py,sha256=kM0twWsmGVgn2TLtq72J8OIZu1x7mtFSapNc67WkhZY,78
+tyba_client/client.py,sha256=GFGeFoVHDHEFrwfmNbtboY5s5I-5_xE4e-h5WBxAE24,21753
+tyba_client/forecast.py,sha256=P9GuKPrTCQpdxatSPCck5dezfMIe7otCjOiylyPVh-s,8383
+tyba_client/operations.py,sha256=_j6ErTmEORYLxj815BX0ZLtIkmx-SE84heADJ136UD0,5388
+tyba_client/utils.py,sha256=n4tUBGlQIwxbLqJcQRiAIbIJA0DaLSjbAxakhukqaeE,876
+tyba_client-0.5.0.dist-info/LICENSE,sha256=LbMfEdjEK-IRzvCfdEBhn9UCANze0Rc7hWrQTEj_xvU,1079
+tyba_client-0.5.0.dist-info/METADATA,sha256=Eb39BSUVvdBUSmXHjYuLef3MMWxZEn1_puFOfJz3lFI,998
+tyba_client-0.5.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+tyba_client-0.5.0.dist-info/RECORD,,

{tyba_client-0.4.18.dist-info → tyba_client-0.5.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.1.2
 Root-Is-Purelib: true
 Tag: py3-none-any

tyba_client/io.py

@@ -1,163 +0,0 @@
-from __future__ import annotations
-from generation_models import (
-    PVModuleMermoudLejeune,
-    ONDInverter,
-    ONDEfficiencyCurve,
-    ONDTemperatureDerateCurve,
-)
-from warnings import warn
-
-warn("""tyba_client.io is deprecated in favor of using generation_models.utils.pvsyst_readers. Tyba will
-cease to support tyba_client.io on 6/1/2025. See https://docs.tybaenergy.com/api/index.html or reach out
-to us for help migrating.""", FutureWarning)
-
-
-def read_pvsyst_file(path: str) -> dict:
-    try:
-        with open(path, "r", encoding="utf-8-sig") as f:
-            blob = {}
-            trace = [blob]
-            lines = [line for line in f.readlines() if "=" in line]
-            indentations = [len(line) - len(line.lstrip()) for line in lines]
-            for indentation, line in zip(indentations, lines):
-                if divmod(indentation, 2)[1] != 0:
-                    raise PVSystFileError(f"invalid indentation at {line}")
-            structure = [
-                (y - x) // 2 for x, y in zip(indentations[:-1], indentations[1:])
-            ]
-            structure.append(0)
-            for line, typ in zip(lines, structure):
-                stripped = line.strip()
-                k, v = stripped.split("=")
-                if typ == 0:
-                    trace[-1][k] = v
-                elif typ == 1:
-                    trace[-1][k] = {"type": v, "items": {}}
-                    trace.append(trace[-1][k]["items"])
-                elif typ < 0:
-                    trace[-1][k] = v
-                    for _ in range(-1 * typ):
-                        trace.pop()
-                else:
-                    raise PVSystFileError(f"invalid structure at {line}")
-    except UnicodeDecodeError:
-        raise PVSystFileError(
-            f"File not utf-8 encoded. Please encode the file to utf-8 and try again"
-        )
-    return blob
-
-
-class PVSystFileError(ValueError):
-    """:meta private:"""
-
-    pass
-
-
-def pv_module_from_pan(
-    pan_file: str,
-    bifacial_ground_clearance_height=1.0,
-    bifacial_transmission_factor: float = 0.013,
-) -> PVModuleMermoudLejeune:
-    """DEPRECATED. See :func:`generation_models.utils.pvsyst_readers.pv_module_from_pan`."""
-    pan_blob = read_pvsyst_file(pan_file)
-    data = pan_blob["PVObject_"]["items"]
-    commercial = data["PVObject_Commercial"]["items"]
-    if "PVObject_IAM" in data:
-        iam_points = [
-            v.split(",")
-            for k, v in data["PVObject_IAM"]["items"]["IAMProfile"]["items"].items()
-            if k.startswith("Point_")
-        ]
-        iam_angles = [float(v[0]) for v in iam_points]
-        iam_values = [float(v[1]) for v in iam_points]
-    else:
-        iam_angles = None
-        iam_values = None
-    return PVModuleMermoudLejeune(
-        bifacial="BifacialityFactor" in data,
-        bifacial_transmission_factor=bifacial_transmission_factor,
-        bifaciality=float(data.get("BifacialityFactor", 0.65)),
-        bifacial_ground_clearance_height=bifacial_ground_clearance_height,
-        n_parallel=int(data["NCelP"]),
-        n_diodes=int(data["NDiode"]),
-        n_series=int(data["NCelS"]),
-        t_ref=float(data["TRef"]),
-        s_ref=float(data["GRef"]),
-        i_sc_ref=float(data["Isc"]),
-        v_oc_ref=float(data["Voc"]),
-        i_mp_ref=float(data["Imp"]),
-        v_mp_ref=float(data["Vmp"]),
-        alpha_sc=float(data["muISC"]) * 1e-3,  # TODO: check units
-        beta_oc=float(data["muVocSpec"]) * 1e-3,
-        n_0=float(data["Gamma"]),
-        mu_n=float(data["muGamma"]),
-        r_sh_ref=float(data["RShunt"]),
-        r_s=float(data["RSerie"]),
-        r_sh_0=float(data["Rp_0"]),
-        r_sh_exp=float(data["Rp_Exp"]),
-        tech=data["Technol"],
-        length=float(commercial["Height"]),
-        width=float(commercial["Width"]),
-        # faiman cell temp model used by PVSyst
-        t_c_fa_alpha=float(data["Absorb"]),
-        # IAM
-        iam_c_cs_iam_value=iam_values,
-        iam_c_cs_inc_angle=iam_angles,
-        custom_d2_mu_tau=data.get("D2MuTau"),
-    )
-
-
-def inverter_from_ond(ond_file: str, includes_xfmr: bool = True) -> ONDInverter:
-    """DEPRECATED. See :func:`generation_models.utils.pvsyst_readers.inverter_from_ond`."""
-    ond = read_pvsyst_file(ond_file)
-    data = ond["PVObject_"]["items"]
-    converter = data["Converter"]["items"]
-    voltage_curve_points = [float(v) for v in converter["VNomEff"].split(",") if v]
-    if len(voltage_curve_points) != 3:
-        raise NotImplementedError(
-            "OND Inverter only accepts voltage curves of length 3"
-        )
-    temp_derate_curve = ONDTemperatureDerateCurve(
-        ambient_temp=[
-            -300,
-            float(converter["TPMax"]),
-            float(converter["TPNom"]),
-            float(converter["TPLim1"]),
-            float(converter["TPLimAbs"]),
-        ],
-        max_ac_power=[
-            float(converter["PMaxOUT"]) * 1e3,
-            float(converter["PMaxOUT"]) * 1e3,
-            float(converter["PNomConv"]) * 1e3,
-            float(converter["PLim1"]) * 1e3,
-            float(converter.get("PlimAbs", 0.0)) * 1e3,
-        ],
-    )
-    raw_power_curves = [converter[f"ProfilPIOV{i}"]["items"] for i in [1, 2, 3]]
-    power_curves = []
-    for curve in raw_power_curves:
-        points = [
-            [float(v) for v in curve[f"Point_{i}"].split(",")]
-            for i in range(1, int(curve["NPtsEff"]) + 1)
-        ]
-        dc, ac = zip(*points)
-        power_curves.append(ONDEfficiencyCurve(dc_power=dc, ac_power=ac))
-    aux_loss = data.get("Aux_Loss")
-    aux_loss_threshold = data.get("Aux_Thresh")
-    if aux_loss is not None:
-        aux_loss = float(aux_loss)
-        aux_loss_threshold = float(aux_loss_threshold)
-    return ONDInverter(
-        mppt_low=float(converter["VMppMin"]),
-        mppt_high=float(converter["VMPPMax"]),
-        paco=float(converter["PMaxOUT"]) * 1e3,
-        vdco=voltage_curve_points[1],
-        temp_derate_curve=temp_derate_curve,
-        nominal_voltages=voltage_curve_points,
-        power_curves=power_curves,
-        dc_turn_on=float(converter["PSeuil"]),
-        pnt=float(data["Night_Loss"]),
-        aux_loss=aux_loss,
-        aux_loss_threshold=aux_loss_threshold,
-        includes_xfmr=includes_xfmr,
-    )

tyba_client/models.py

@@ -1,626 +0,0 @@
-from __future__ import annotations
-from dataclasses import dataclass, field
-from enum import Enum
-from dataclasses_json import config, dataclass_json
-import pandas as pd
-import typing as t
-from .io import read_pvsyst_file
-from .solar_resource import psm_column_map
-from warnings import warn
-
-from tyba_client.utils import string_enum
-
-
-class ValidationError(ValueError):
-    pass
-
-
-def opt_field():
-    return field(default=None, metadata=config(exclude=lambda x: x is None))
-
-
-@dataclass_json
-@dataclass
-class FixedTilt(object):
-    tilt: float
-
-
-@dataclass_json
-@dataclass
-class SingleAxisTracking(object):
-    rotation_limit: float = 45.0
-    backtrack: bool = True
-
-
-@dataclass_json
-@dataclass
-class BaseSystemDesign(object):
-    dc_capacity: float
-    ac_capacity: float
-    poi_limit: float
-
-
-@dataclass_json
-@dataclass
-class SystemDesign(BaseSystemDesign):
-    gcr: float
-    tracking: t.Union[FixedTilt, SingleAxisTracking]
-    modules_per_string: t.Optional[int] = opt_field()
-    strings_in_parallel: t.Optional[int] = opt_field()
-    azimuth: t.Optional[float] = opt_field()
-
-
-@dataclass_json
-@dataclass
-class BaseInverter(object):
-    mppt_low: float
-    mppt_high: float
-    paco: float
-    vdco: float
-    pnt: float
-
-
-@dataclass_json
-@dataclass
-class ONDTemperatureDerateCurve(object):
-    ambient_temp: t.List[float]
-    max_ac_power: t.List[float]
-
-
-@dataclass_json
-@dataclass
-class ONDEfficiencyCurve(object):
-    dc_power: t.List[float]
-    ac_power: t.List[float]
-
-
-@dataclass_json
-@dataclass
-class ONDInverter(BaseInverter):
-    temp_derate_curve: ONDTemperatureDerateCurve
-    nominal_voltages: t.List[float]
-    power_curves: t.List[ONDEfficiencyCurve]
-    dc_turn_on: float
-    aux_loss: t.Optional[float] = opt_field()
-    aux_loss_threshold: t.Optional[float] = opt_field()
-    includes_xfmr: t.Optional[bool] = True
-
-    @classmethod
-    def from_ond(cls, ond_file: str):
-        ond = read_pvsyst_file(ond_file)
-        data = ond["PVObject_"]["items"]
-        converter = data["Converter"]["items"]
-        voltage_curve_points = [float(v) for v in converter["VNomEff"].split(",") if v]
-        if len(voltage_curve_points) != 3:
-            raise NotImplementedError(
-                "OND Inverter only accepts voltage curves of length 3"
-            )
-        temp_derate_curve = ONDTemperatureDerateCurve(
-            ambient_temp=[
-                -300,
-                float(converter["TPMax"]),
-                float(converter["TPNom"]),
-                float(converter["TPLim1"]),
-                float(converter["TPLimAbs"]),
-            ],
-            max_ac_power=[
-                float(converter["PMaxOUT"]) * 1e3,
-                float(converter["PMaxOUT"]) * 1e3,
-                float(converter["PNomConv"]) * 1e3,
-                float(converter["PLim1"]) * 1e3,
-                float(converter.get("PlimAbs", 0.0)) * 1e3,
-            ],
-        )
-        raw_power_curves = [converter[f"ProfilPIOV{i}"]["items"] for i in [1, 2, 3]]
-        power_curves = []
-        for curve in raw_power_curves:
-            points = [
-                [float(v) for v in curve[f"Point_{i}"].split(",")]
-                for i in range(1, int(curve["NPtsEff"]) + 1)
-            ]
-            dc, ac = zip(*points)
-            power_curves.append(ONDEfficiencyCurve(dc_power=dc, ac_power=ac))
-        aux_loss = data.get("Aux_Loss")
-        aux_loss_threshold = data.get("Aux_Thresh")
-        if aux_loss is not None:
-            aux_loss = float(aux_loss)
-            aux_loss_threshold = float(aux_loss_threshold)
-        return cls(
-            mppt_low=float(converter["VMppMin"]),
-            mppt_high=float(converter["VMPPMax"]),
-            paco=float(converter["PMaxOUT"]) * 1e3,
-            vdco=voltage_curve_points[1],
-            temp_derate_curve=temp_derate_curve,
-            nominal_voltages=voltage_curve_points,
-            power_curves=power_curves,
-            dc_turn_on=float(converter["PSeuil"]),
-            pnt=float(data["Night_Loss"]),
-            aux_loss=aux_loss,
-            aux_loss_threshold=aux_loss_threshold,
-        )
-
-
-@dataclass_json
-@dataclass
-class Inverter(BaseInverter):
-    pso: float
-    pdco: float
-    c0: float
-    c1: float
-    c2: float
-    c3: float
-    vdcmax: float
-    tdc: t.List[t.List[float]] = field(default_factory=lambda: [[1.0, 52.8, -0.021]])
-    includes_xfmr: t.Optional[bool] = True
-
-
-@dataclass_json
-@dataclass
-class PVModule(object):
-    bifacial: bool
-    a_c: float
-    n_s: float
-    i_sc_ref: float
-    v_oc_ref: float
-    i_mp_ref: float
-    v_mp_ref: float
-    alpha_sc: float
-    beta_oc: float
-    t_noct: float
-    a_ref: float
-    i_l_ref: float
-    i_o_ref: float
-    r_s: float
-    r_sh_ref: float
-    adjust: float
-    gamma_r: float
-    bifacial_transmission_factor: float
-    bifaciality: float
-    bifacial_ground_clearance_height: float
-
-
-@string_enum
-class MermoudModuleTech(Enum):
-    SiMono = "mtSiMono"
-    SiPoly = "mtSiPoly"
-    CdTe = "mtCdTe"
-    CIS = "mtCIS"
-    uCSi_aSiH = "mtuCSi_aSiH"
-
-
-@dataclass_json
-@dataclass
-class PVModuleMermoudLejeune(object):
-    bifacial: bool
-    bifacial_transmission_factor: float
-    bifaciality: float
-    bifacial_ground_clearance_height: float
-    tech: MermoudModuleTech
-    i_mp_ref: float
-    i_sc_ref: float
-    length: float
-    n_diodes: int
-    n_parallel: int
-    n_series: int
-    r_s: float
-    r_sh_0: float
-    r_sh_exp: float
-    r_sh_ref: float
-    s_ref: float
-    t_c_fa_alpha: float
-    t_ref: float
-    v_mp_ref: float
-    v_oc_ref: float
-    width: float
-    alpha_sc: float
-    beta_oc: float
-    mu_n: float
-    n_0: float
-    iam_c_cs_iam_value: t.Optional[t.List[float]] = opt_field()
-    iam_c_cs_inc_angle: t.Optional[t.List[float]] = opt_field()
-    custom_d2_mu_tau: t.Optional[float] = opt_field()
-
-    @classmethod
-    def from_pan(cls, pan_file: str):
-        pan_blob = read_pvsyst_file(pan_file)
-        data = pan_blob["PVObject_"]["items"]
-        commercial = data["PVObject_Commercial"]["items"]
-        if "PVObject_IAM" in data:
-            iam_points = [
-                v.split(",")
-                for k, v in data["PVObject_IAM"]["items"]["IAMProfile"]["items"].items()
-                if k.startswith("Point_")
-            ]
-            iam_angles = [float(v[0]) for v in iam_points]
-            iam_values = [float(v[1]) for v in iam_points]
-        else:
-            iam_angles = None
-            iam_values = None
-
-        return cls(
-            bifacial="BifacialityFactor" in data,
-            bifacial_transmission_factor=0.013,
-            bifaciality=float(data.get("BifacialityFactor", 0.65)),
-            bifacial_ground_clearance_height=1.0,
-            n_parallel=int(data["NCelP"]),
-            n_diodes=int(data["NDiode"]),
-            n_series=int(data["NCelS"]),
-            t_ref=float(data["TRef"]),
-            s_ref=float(data["GRef"]),
-            i_sc_ref=float(data["Isc"]),
-            v_oc_ref=float(data["Voc"]),
-            i_mp_ref=float(data["Imp"]),
-            v_mp_ref=float(data["Vmp"]),
-            alpha_sc=float(data["muISC"]) * 1e-3,  # TODO: check units
-            beta_oc=float(data["muVocSpec"]) * 1e-3,
-            n_0=float(data["Gamma"]),
-            mu_n=float(data["muGamma"]),
-            r_sh_ref=float(data["RShunt"]),
-            r_s=float(data["RSerie"]),
-            r_sh_0=float(data["Rp_0"]),
-            r_sh_exp=float(data["Rp_Exp"]),
-            tech=data["Technol"],
-            length=float(commercial["Height"]),
-            width=float(commercial["Width"]),
-            # faiman cell temp model used by PVSyst
-            t_c_fa_alpha=float(data["Absorb"]),
-            # IAM
-            iam_c_cs_iam_value=iam_values,
-            iam_c_cs_inc_angle=iam_angles,
-            custom_d2_mu_tau=data.get("D2MuTau"),
-        )
-
-
-@dataclass_json
-@dataclass
-class Transformer(object):
-    load_loss: float
-    no_load_loss: float
-    rating: t.Optional[float] = opt_field()
-
-
-@dataclass_json
-@dataclass
-class _DCLosses(object):
-    dc_optimizer: t.Optional[float] = opt_field()
-    enable_snow_model: t.Optional[bool] = opt_field()
-    dc_wiring: t.Optional[float] = opt_field()
-    soiling: t.Optional[t.List[float]] = opt_field()
-    diodes_connections: t.Optional[float] = opt_field()
-    mismatch: t.Optional[float] = opt_field()
-    nameplate: t.Optional[float] = opt_field()
-    rear_irradiance: t.Optional[float] = opt_field()
-    lid: t.Optional[float] = opt_field()
-    dc_array_adjustment: t.Optional[float] = opt_field()
-    mppt_error: t.Optional[float] = opt_field()
-
-
-@dataclass_json
-@dataclass
-class ACLosses(object):
-    ac_wiring: t.Optional[float] = opt_field()
-    transformer_load: t.Optional[float] = opt_field()
-    transformer_no_load: t.Optional[float] = opt_field()
-    transmission: t.Optional[float] = opt_field()
-    poi_adjustment: t.Optional[float] = opt_field()
-    mv_transformer: t.Optional[Transformer] = opt_field()
-    hv_transformer: t.Optional[Transformer] = opt_field()
-
-    def __post_init__(self):
-        if not (
-            (self.transformer_load is None and self.transformer_no_load is None)
-            or self.hv_transformer is None
-        ):
-            raise ValidationError(
-                "Cannot provide hv_transformer if transformer_load or transformer_no_load are provided"
-            )
-
-
-@dataclass_json
-@dataclass
-class Losses(_DCLosses, ACLosses):
-    pass
-
-
-@dataclass_json
-@dataclass
-class Layout(object):
-    orientation: t.Optional[str] = opt_field()
-    vertical: t.Optional[int] = opt_field()
-    horizontal: t.Optional[int] = opt_field()
-    aspect_ratio: t.Optional[float] = opt_field()
-
-
-@dataclass_json
-@dataclass
-class SolarResourceTimeSeries(object):
-    year: t.List[int]
-    month: t.List[int]
-    day: t.List[int]
-    hour: t.List[int]
-    minute: t.List[int]
-    tdew: t.List[float]
-    df: t.List[float]
-    dn: t.List[float]
-    gh: t.List[float]
-    pres: t.List[float]
-    tdry: t.List[float]
-    wdir: t.List[float]
-    wspd: t.List[float]
-    alb: t.Optional[t.List[float]] = opt_field()
-    snow: t.Optional[t.List[float]] = opt_field()
-
-
-@dataclass_json
-@dataclass
-class SolarResource(object):
-    latitude: float
-    longitude: float
-    time_zone_offset: float
-    elevation: float
-    data: SolarResourceTimeSeries
-    monthly_albedo: t.Optional[t.List[float]] = opt_field()
-
-    @classmethod
-    def from_csv(cls, filename: str) -> SolarResource:
-        with open(filename) as f:
-            _meta = [f.readline().split(",") for _ in range(2)]
-            _data = pd.read_csv(f)
-        meta = {k: v for k, v in zip(*_meta)}
-        data = _data.rename(columns=psm_column_map)
-        return cls(
-            latitude=float(meta["Latitude"]),
-            longitude=float(meta["Longitude"]),
-            elevation=float(meta["Elevation"]),
-            time_zone_offset=float(meta["Time Zone"]),
-            data=data.to_dict(orient="list"),
-        )
-
-
-@string_enum
-class ArrayDegradationMode(str, Enum):
-    linear = "linear"
-    compounding = "compounding"
-
-
-@dataclass_json
-@dataclass
-class PVModel(object):
-    solar_resource: t.Union[t.Tuple[float, float], SolarResource]
-    inverter: t.Union[str, BaseInverter]
-    pv_module: t.Union[str, PVModule, PVModuleMermoudLejeune]
-    system_design: SystemDesign
-    losses: t.Optional[Losses] = opt_field()
-    layout: t.Optional[Layout] = opt_field()
-    project_term: t.Optional[int] = opt_field()
-    array_degradation_rate: t.Optional[float] = opt_field()
-    array_degradation_mode: t.Optional[ArrayDegradationMode] = "linear"
-
-
-PVGenerationModel = DetailedPVModel = PVModel
-
-
-@dataclass_json
-@dataclass
-class DCProductionProfile(object):
-    power: t.List[float]
-    voltage: t.List[float]
-    ambient_temp: t.Optional[t.List[float]]
-
-
-@dataclass_json
-@dataclass
-class ACProductionProfile(object):
-    power: t.List[float]
-    ambient_temp: t.Optional[t.List[float]]
-
-
-@dataclass_json
-@dataclass
-class ACExternalGenerationModel(object):
-    production_override: ACProductionProfile
-    system_design: BaseSystemDesign
-    losses: ACLosses = opt_field()
-    time_interval_mins: t.Optional[int] = opt_field()
-    project_term: t.Optional[int] = opt_field()
-    project_term_units: t.Optional[str] = opt_field()
-
-
-@dataclass_json
-@dataclass
-class DCExternalGenerationModel(object):
-    production_override: DCProductionProfile
-    system_design: BaseSystemDesign
-    inverter: t.Union[Inverter, ONDInverter, str]
-    losses: ACLosses = opt_field()
-    time_interval_mins: t.Optional[int] = opt_field()
-    project_term: t.Optional[int] = opt_field()
-    project_term_units: t.Optional[str] = opt_field()
-
-
-GenerationModel = t.Union[
-    PVGenerationModel, DCExternalGenerationModel, ACExternalGenerationModel
-]
-
-
-@dataclass_json
-@dataclass
-class BatteryHVAC(object):
-    container_temperature: float
-    cop: float
-    u_ambient: float
-    discharge_efficiency_container: float
-    charge_efficiency_container: float
-    aux_xfmr_efficiency: float
-
-
-@dataclass_json
-@dataclass
-class TableCapDegradationModel(object):
-    annual_capacity_derates: t.List[float]
-
-
-@dataclass_json
-@dataclass
-class TableEffDegradationModel(object):
-    annual_efficiency_derates: t.List[float]
-
-
-@dataclass_json
-@dataclass
-class Battery(object):
-    power_capacity: float
-    energy_capacity: float
-    charge_efficiency: float
-    discharge_efficiency: float
-    term: float
-    degradation_rate: t.Optional[float] = opt_field()
-    degradation_annual_cycles: t.Optional[float] = 365
-    hvac: t.Optional[BatteryHVAC] = opt_field()
-    capacity_degradation_model: t.Optional[TableCapDegradationModel] = opt_field()
-    efficiency_degradation_model: t.Optional[TableEffDegradationModel] = opt_field()
-
-
-@dataclass_json
-@dataclass
-class StorageInputs(object):
-    batteries: t.List[Battery]
-    cycling_cost_adder: t.Optional[float] = 0
-    annual_cycle_limit: t.Optional[float] = opt_field()
-    window: t.Optional[int] = opt_field()
-    step: t.Optional[int] = opt_field()
-    flexible_solar: t.Optional[bool] = opt_field()
-    dart: t.Optional[bool] = opt_field()
-    dam_annual_cycle_limit: t.Optional[float] = opt_field()
-    no_virtual_trades: t.Optional[bool] = opt_field()
-    initial_soe: t.Optional[float] = 0
-    symmetric_reg: t.Optional[bool] = False
-    duration_requirement_on_discharge: t.Optional[bool] = opt_field()
-    solver: t.Optional[bool] = opt_field()
-
-
-@dataclass_json
-@dataclass
-class AncillaryEnergyPrices(object):
-    dam: t.List[float]
-    rtm: t.List[float]
-
-
-@dataclass_json
-@dataclass
-class StorageModel(object):
-    storage_inputs: StorageInputs
-    energy_prices: t.Union[AncillaryEnergyPrices, t.List[float]]
-
-
-@dataclass_json
-@dataclass
-class Utilization(object):
-    actual: float
-    lower: float
-    upper: float
-
-
-@dataclass_json
-@dataclass
-class TimeSeriesUtilization(object):
-    actual: t.List[float]
-    lower: t.List[float]
-    upper: t.List[float]
-
-
-@dataclass_json
-@dataclass
-class ReserveMarket(object):
-    price: t.List[float]
-    offer_cap: float
-    utilization: t.Union[Utilization, TimeSeriesUtilization]
-    obligation: t.Optional[t.List[float]] = opt_field()
-    duration_requirement: t.Optional[float] = opt_field()
-
-
-@dataclass_json
-@dataclass
-class AncillaryUpMarkets(object):
-    reserves: t.Optional[ReserveMarket] = opt_field()
-    reg_up: t.Optional[ReserveMarket] = opt_field()
-    generic_up: t.Optional[ReserveMarket] = opt_field()
-
-
-@dataclass_json
-@dataclass
-class AncillaryDownMarket(object):
-    reg_down: t.Optional[ReserveMarket] = opt_field()
-    generic_down: t.Optional[ReserveMarket] = opt_field()
-
-
-@dataclass_json
-@dataclass
-class AncillaryMarkets(object):
-    up: t.Optional[AncillaryUpMarkets] = opt_field()
-    down: t.Optional[AncillaryDownMarket] = opt_field()
-
-
-@dataclass_json
-@dataclass
-class PeakWindow(object):
-    mask: t.List[bool]
-    price: float
-
-
-@dataclass_json
-@dataclass
-class LoadPeakReduction(object):
-    load: t.List[float]
-    max_load: t.List[float]
-    seasonal_peak_windows: t.Optional[t.List[PeakWindow]] = opt_field()
-    daily_peak_windows: t.Optional[t.List[PeakWindow]] = opt_field()
-
-
-@dataclass_json
-@dataclass
-class StandaloneStorageModel(StorageModel):
-    time_interval_mins: t.Optional[int] = opt_field()
-    ancillary_markets: t.Optional[AncillaryMarkets] = opt_field()
-    ambient_temp: t.Optional[t.List[float]] = opt_field()
-    import_limit: t.Optional[t.List[float]] = opt_field()
-    export_limit: t.Optional[t.List[float]] = opt_field()
-    load_peak_reduction: t.Optional[LoadPeakReduction] = opt_field()
-    project_term: t.Optional[int] = opt_field()
-    project_term_units: t.Optional[str] = opt_field()
-
-
-@string_enum
-class StorageCoupling(Enum):
-    ac = "ac"
-    dc = "dc"
-    hv_ac = "hv_ac"
-
-
-@dataclass_json
-@dataclass
-class PVStorageModel(object):
-    storage_coupling: StorageCoupling = field(metadata=StorageCoupling.__metadata__)
-    pv_inputs: GenerationModel
-    storage_inputs: StorageInputs
-    energy_prices: t.Union[AncillaryEnergyPrices, t.List[float]]
-    enable_grid_charge_year: t.Optional[int] = opt_field()
-    ancillary_markets: t.Optional[AncillaryMarkets] = opt_field()
-    import_limit: t.Optional[t.List[float]] = opt_field()
-    export_limit: t.Optional[t.List[float]] = opt_field()
-    load_peak_reduction: t.Optional[LoadPeakReduction] = opt_field()
-    time_interval_mins: t.Optional[int] = opt_field()
-
-
-@string_enum
-class Market:
-    RT = "realtime"
-    DA = "dayahead"
-
-
-@string_enum
-class AncillaryService:
-    REGULATION_UP = "Regulation Up"
-    REGULATION_DOWN = "Regulation Down"
-    RESERVES = "Reserves"
-    ECRS = "ECRS"

tyba_client/solar_resource.py

@@ -1,123 +0,0 @@
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-import pandas as pd
-import requests
-from generation_models import SolarResource, SolarResourceTimeSeries
-from requests.exceptions import HTTPError
-import typing as t
-from io import StringIO
-from warnings import warn
-
-
-warn("""tyba_client.solar_resource is deprecated in favor of using generation_models.utils.psm_readers. Tyba will
-cease to support tyba_client.solar_resource on 6/1/2025. See https://docs.tybaenergy.com/api/index.html or reach out
-to us for help migrating.""", FutureWarning)
-
-
-@dataclass
-class PSMClient:
-    api_key: str
-    email: str
-
-    def _get_solar_resource(
-        self,
-        source: str,
-        latitude: float,
-        longitude: float,
-        year: t.Union[str, int],
-        utc: bool,
-    ):
-        resp = requests.get(
-            url=f"https://developer.nrel.gov/api/nsrdb/v2/solar/{source}.csv",
-            params={
-                "api_key": self.api_key,
-                "email": self.email,
-                "wkt": f"POINT({longitude} {latitude})",
-                "names": year,
-                "utc": "true" if utc else "false",
-            },
-        )
-        if resp.status_code == 400:
-            raise HTTPError(resp.json()["errors"])
-        resp.raise_for_status()
-        return resp.text
-
-    @staticmethod
-    def _process_csv(raw: str) -> SolarResource:
-        with StringIO(raw) as f:
-            _meta = [f.readline().split(",") for _ in range(2)]
-            _data = pd.read_csv(f)
-        meta = {k: v for k, v in zip(*_meta)}
-        data = _data.rename(columns=psm_column_map)
-        return SolarResource(
-            latitude=float(meta["Latitude"]),
-            longitude=float(meta["Longitude"]),
-            elevation=float(meta["Elevation"]),
-            time_zone_offset=float(meta["Time Zone"]),
-            data=SolarResourceTimeSeries(**data.to_dict(orient="list")),
-        )
-
-    def get_historical(
-        self,
-        latitude: float,
-        longitude: float,
-        year: int,
-        utc: bool = False,
-    ) -> SolarResource:
-        raw = self._get_solar_resource(source="psm3-2-2-download", latitude=latitude, longitude=longitude, year=year, utc=utc)
-        return self._process_csv(raw)
-
-    def get_typical(
-        self,
-        latitude: float,
-        longitude: float,
-        year: str = "tgy-2022",
-        utc: bool = False,
-    ) -> SolarResource:
-        raw = self._get_solar_resource(source="psm3-2-2-tmy-download", latitude=latitude, longitude=longitude, year=year, utc=utc)
-        return self._process_csv(raw)
-
-
-def solar_resource_from_psm_csv(
-    filename: str,
-    monthly_albedo: t.Optional[t.List[float]] = None,
-) -> SolarResource:
-    """_"""
-    with open(filename) as f:
-        _meta = [f.readline().split(",") for _ in range(2)]
-        _data = pd.read_csv(f)
-    meta = {k: v for k, v in zip(*_meta)}
-    data = _data.rename(columns=psm_column_map)
-    return SolarResource(
-        latitude=float(meta["Latitude"]),
-        longitude=float(meta["Longitude"]),
-        elevation=float(meta["Elevation"]),
-        time_zone_offset=float(meta["Time Zone"]),
-        data=SolarResourceTimeSeries(**data.to_dict(orient="list")),
-        monthly_albedo=monthly_albedo,
-    )
-
-
-psm_column_map = {
-    "Year": "year",
-    "Month": "month",
-    "Day": "day",
-    "Hour": "hour",
-    "Minute": "minute",
-    "GHI": "gh",
-    "DNI": "dn",
-    "DHI": "df",
-    "POA": "poa",
-    "Temperature": "tdry",
-    # twet
-    "Dew Point": "tdew",
-    "Relative Humidity": "rhum",
-    "Pressure": "pres",
-    # Snow
-    "Surface Albedo": "alb",
-    # aod
-    "Wind Speed": "wspd",
-    "Wind Direction": "wdir",
-}

tyba_client-0.4.18.dist-info/RECORD

@@ -1,12 +0,0 @@
-tyba_client/__init__.py,sha256=42STGor_9nKYXumfeV5tiyD_M8VdcddX7CEexmibPBk,22
-tyba_client/client.py,sha256=RAvjZkjWDDeY4eJXD2oELF4E1DOa02AqAcvWftsxISY,23295
-tyba_client/forecast.py,sha256=P9GuKPrTCQpdxatSPCck5dezfMIe7otCjOiylyPVh-s,8383
-tyba_client/io.py,sha256=0FVRtUjSDzyWYBvIMSJH7bCclCRqD2Y-pbcsJ-Ufyo0,6226
-tyba_client/models.py,sha256=NOo39qStMkWBhfLPkUu37MaKMe3E2yFc5KAzUnFy96M,17569
-tyba_client/operations.py,sha256=j03o3hMffnUttRzxqiGx3qUonCplbI6UENK2W-dz1vY,5390
-tyba_client/solar_resource.py,sha256=0Jte2cZpE-USHeW-qac4AN1mI2tmrC-VSahnbs4v3Bs,3683
-tyba_client/utils.py,sha256=n4tUBGlQIwxbLqJcQRiAIbIJA0DaLSjbAxakhukqaeE,876
-tyba_client-0.4.18.dist-info/LICENSE,sha256=LbMfEdjEK-IRzvCfdEBhn9UCANze0Rc7hWrQTEj_xvU,1079
-tyba_client-0.4.18.dist-info/METADATA,sha256=GW_akUmZaFqFqM6bajA_0GXOFf2LFcPzho7m1It-A60,1324
-tyba_client-0.4.18.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-tyba_client-0.4.18.dist-info/RECORD,,