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
6 changes: 0 additions & 6 deletions misc/endpoints/Balancing/12.3.B&C Balancing energy bids.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,6 @@
"value": "A01",
"description": "[O] A01 = Up; A02 = Down",
"disabled": true
},
{
"key": "curveType",
"value": "A03",
"description": "[O] A01 = Sequential fixed block; A03 = Variable sized blocks (default)",
"disabled": true
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@
"key": "periodEnd",
"value": "202503020000",
"description": "[M] Pattern yyyyMMddHHmm e.g. 201601010000"
},
{
"key": "curveType",
"value": "A03",
"description": "[O] A01 = Sequential fixed block; A03 = Variable sized blocks (default)",
"disabled": true
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@
"key": "periodEnd",
"value": "202301022300",
"description": "[M] Pattern yyyyMMddHHmm e.g. 201601010000"
},
{
"key": "curveType",
"value": "A03",
"description": "[O] A01 = Sequential fixed block; A03 = Variable sized blocks (default)",
"disabled": true
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@
"value": "0",
"description": "[O] Integer: Zero‑based index of the first TimeSeries to return. The offset parameter paginates the response in batches of 100 TimeSeries (e.g., offset = n returns the TimeSeries in the range n+1 to n+100).",
"disabled": true
},
{
"key": "curveType",
"value": "A03",
"description": "[O] A01 = Sequential fixed block; A03 = Variable sized blocks (default)",
"disabled": true
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,6 @@
"value": "100",
"description": "[O] Integer: Zero‑based index of the first TimeSeries to return. The offset parameter paginates the response in batches of 100 TimeSeries (e.g., offset = n returns the TimeSeries in the range n+1 to n+100).",
"disabled": true
},
{
"key": "curveType",
"value": "A03",
"description": "[O] A01 = Sequential fixed block; A03 = Variable sized blocks (default)",
"disabled": true
}
]
}
6 changes: 0 additions & 6 deletions misc/endpoints/Market/11.1.B Flow Based Allocations.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@
"key": "periodEnd",
"value": "201402040500",
"description": "[M] Pattern yyyyMMddHHmm e.g. 201601010000"
},
{
"key": "curveType",
"value": "A03",
"description": "[O] A01 = Sequential fixed block; A03 = Variable sized blocks (default)",
"disabled": true
}
]
}
6 changes: 0 additions & 6 deletions misc/endpoints/OMI/Other Market Information.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@
"value": "NDE5ODBiYjFkM2ExMTljYTM5Mzk2ODcxNDFkZDE4MzU=",
"description": "[O] If mRID is included, individual versions of the particular event are queried using the rest of the parameters",
"disabled": true
},
{
"key": "curveType",
"value": "A03",
"description": "[O] A01 = Sequential fixed block; A03 = Variable sized blocks (default)",
"disabled": true
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@
"value": "0",
"description": "[O] Integer: Zero‑based index of the first XML document to return. The offset parameter paginates the response in batches of 100 XML documents (e.g., offset = n returns the XMLs in the range n+1 to n+100).",
"disabled": true
},
{
"key": "curveType",
"value": "A03",
"description": "[O] A01 = Sequential fixed block; A03 = Variable sized blocks (default)",
"disabled": true
}
]
}
18 changes: 0 additions & 18 deletions src/entsoe/Balancing/specific_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,6 @@ def __init__(
direction: Optional[str] = None,
# Additional common parameters
offset: int = 0,
curve_type: str = "A01",
):
"""
Initialize balancing energy bids parameters.
Expand All @@ -331,8 +330,6 @@ def __init__(
original_market_product: A02=Specific, A03=Integrated Process, A04=Local
direction: A01=Up, A02=Down
offset: Offset for pagination
curve_type: Curve type (default "A01" = Sequential fixed block;
"A03" = Variable sized blocks)
"""
# Initialize with preset and user parameters
super().__init__(
Expand All @@ -346,7 +343,6 @@ def __init__(
original_market_product=original_market_product,
direction=direction,
offset=offset,
curve_type=curve_type,
)


Expand Down Expand Up @@ -1088,8 +1084,6 @@ def __init__(
acquiring_domain: str,
connecting_domain: str,
process_type: str,
# Additional common parameters
curve_type: str = "A01",
):
"""
Initialize netted and exchanged volumes parameters.
Expand All @@ -1110,7 +1104,6 @@ def __init__(
acquiring_domain=acquiring_domain,
connecting_domain=connecting_domain,
process_type=process_type,
curve_type=curve_type,
)


Expand Down Expand Up @@ -1138,8 +1131,6 @@ def __init__(
acquiring_domain: str,
connecting_domain: str,
process_type: str,
# Additional common parameters
curve_type: str = "A01",
):
"""
Initialize netted and exchanged volumes per border parameters.
Expand All @@ -1160,7 +1151,6 @@ def __init__(
acquiring_domain=acquiring_domain,
connecting_domain=connecting_domain,
process_type=process_type,
curve_type=curve_type,
)


Expand Down Expand Up @@ -1190,7 +1180,6 @@ def __init__(
process_type: str,
# Additional common parameters
offset: int = 0,
curve_type: str = "A01",
):
"""
Initialize elastic demands parameters.
Expand All @@ -1201,8 +1190,6 @@ def __init__(
acquiring_domain: EIC code of a Scheduling Area
process_type: A51=aFRR, A47=mFRR
offset: Offset for pagination
curve_type: Curve type (default "A01" = Sequential fixed block;
"A03" = Variable sized blocks)
"""
# Initialize with preset and user parameters
super().__init__(
Expand All @@ -1213,7 +1200,6 @@ def __init__(
business_type="B75",
process_type=process_type,
offset=offset,
curve_type=curve_type,
)


Expand Down Expand Up @@ -1246,7 +1232,6 @@ def __init__(
business_type: Optional[str] = None,
# Additional common parameters
offset: int = 0,
curve_type: str = "A01",
):
"""
Initialize changes to bid availability parameters.
Expand All @@ -1259,8 +1244,6 @@ def __init__(
C43=Voltage limit, C44=Current limit, C45=Short-circuit limit,
C46=Dynamic stability limit
offset: Offset for pagination
curve_type: Curve type (default "A01" = Sequential fixed block;
"A03" = Variable sized blocks)
"""
# Initialize with preset and user parameters
super().__init__(
Expand All @@ -1271,7 +1254,6 @@ def __init__(
process_type="A47",
business_type=business_type,
offset=offset,
curve_type=curve_type,
)


Expand Down
5 changes: 2 additions & 3 deletions src/entsoe/Base/Balancing.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def __init__(
registered_resource: Optional[str] = None,
# Additional common parameters
offset: int | None = None,
curve_type: str = "A01",
curve_type: Optional[str] = None,
):
"""
Initialize balancing data parameters for ENTSO-E Transparency Platform.
Expand Down Expand Up @@ -62,8 +62,7 @@ def __init__(
direction: Direction (A01=Up, A02=Down)
registered_resource: EIC code of registered resource/transmission asset
offset: Offset for pagination
curve_type: Curve type (default "A01" = Sequential fixed block;
"A03" = Variable sized blocks)
curve_type: Curve type (default None, can be set to "A01" or "A03" for specific queries)

Raises:
ValidationError: If any input parameter is invalid
Expand Down
11 changes: 6 additions & 5 deletions src/entsoe/Base/Base.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ def __init__(
document_type: str,
period_start: Optional[int] = None,
period_end: Optional[int] = None,
offset: int | None = None,
curve_type: str = "A01",
offset: Optional[int] = None,
curve_type: Optional[str] = None,
):
"""
Initialize base parameters for ENTSO-E Transparency Platform queries.
Expand All @@ -40,8 +40,7 @@ def __init__(
period_start: Start period (YYYYMMDDHHMM format, optional)
period_end: End period (YYYYMMDDHHMM format, optional)
offset: Offset for pagination
curve_type: Curve type (default "A01" = Sequential fixed block;
"A03" = Variable sized blocks)
curve_type: Curve type (default None, can be set to "A01" or "A03" for specific queries)

Raises:
ValidationError: If any input parameter is invalid
Expand All @@ -52,7 +51,6 @@ def __init__(
# Initialize the base parameters dictionary
self.params: Dict[str, Any] = {
"documentType": document_type,
"curveType": curve_type,
}

# Add period parameters using the proper method
Expand All @@ -61,6 +59,9 @@ def __init__(
if offset is not None:
self.add_optional_param("offset", offset)

if curve_type is not None:
self.add_optional_param("curveType", curve_type)

def validate_eic_code(
self,
eic_code: Optional[str],
Expand Down
5 changes: 2 additions & 3 deletions src/entsoe/Base/Market.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def __init__(
] = None,
# Additional common parameters
offset: int | None = None,
curve_type: str = "A01",
curve_type: Optional[str] = None,
):
"""
Initialize market data parameters for ENTSO-E Transparency Platform.
Expand All @@ -48,8 +48,7 @@ def __init__(
classification_sequence_attribute_instance_component_position: Position
for classification
offset: Offset for pagination
curve_type: Curve type (default "A01" = Sequential fixed block;
"A03" = Variable sized blocks)
curve_type: Curve type (default None, can be set to "A01" or "A03" for specific queries)

Raises:
ValidationError: If any input parameter is invalid
Expand Down
5 changes: 0 additions & 5 deletions src/entsoe/Market/specific_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -389,8 +389,6 @@ def __init__(
in_domain: str,
out_domain: str,
process_type: str,
# Additional common parameters
curve_type: str = "A01",
):
"""
Initialize flow based allocations parameters.
Expand All @@ -402,8 +400,6 @@ def __init__(
out_domain: EIC code of a Region
process_type: Process type (A43=Day ahead, A44=Intraday,
A32=Month-ahead, A33=Year-ahead)
curve_type: Curve type (default "A01" = Sequential fixed block;
"A03" = Variable sized blocks)
"""
# Initialize with preset and user parameters
super().__init__(
Expand All @@ -413,7 +409,6 @@ def __init__(
period_end=period_end,
in_domain=in_domain,
out_domain=out_domain,
curve_type=curve_type,
)

# Validate that in_domain and out_domain are the same
Expand Down
4 changes: 0 additions & 4 deletions src/entsoe/OMI/OMI.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ def __init__(
m_rid: Optional[str] = None,
# Additional common parameters
offset: int = 0,
curve_type: str = "A01",
):
"""
Initialize Other Market Information parameters for ENTSO-E Transparency
Expand All @@ -44,8 +43,6 @@ def __init__(
event are queried using rest of parameters
offset: Offset for pagination (allows downloading more than 200 docs,
offset ∈ [0,4800] so paging restricted to 5000 docs max)
curve_type: Curve type (default "A01" = Sequential fixed block;
"A03" = Variable sized blocks)

Raises:
ValueError: If doc_status is not one of A05, A09, A13
Expand Down Expand Up @@ -90,7 +87,6 @@ def __init__(
period_start=period_start,
period_end=period_end,
offset=0, # Don't pass offset to base, we'll handle it with correct name
curve_type=curve_type,
)

# Add OMI-specific parameters using exact JSON parameter names
Expand Down
4 changes: 0 additions & 4 deletions src/entsoe/OMI/specific_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ def __init__(
m_rid: Optional[str] = None,
# Additional common parameters
offset: int = 0,
curve_type: str = "A01",
):
"""
Initialize other market information parameters.
Expand All @@ -58,8 +57,6 @@ def __init__(
mandatory if period_start and period_end not defined)
m_rid: Message ID for specific information versions
offset: Offset for pagination
curve_type: Curve type (default "A01" = Sequential fixed block;
"A03" = Variable sized blocks)

Note:
Either (period_start, period_end) or
Expand All @@ -75,7 +72,6 @@ def __init__(
doc_status=doc_status,
m_rid=m_rid,
offset=offset,
curve_type=curve_type,
)

# Set the fixed document type for Other Market Information
Expand Down
5 changes: 0 additions & 5 deletions src/entsoe/Outages/specific_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,6 @@ def __init__(
# Optional filtering parameters
doc_status: Optional[str] = None,
m_rid: Optional[str] = None,
# Additional common parameters
curve_type: str = "A01",
):
"""
Initialize fall-backs parameters.
Expand All @@ -409,8 +407,6 @@ def __init__(
doc_status: Document status (A13=Withdrawn, by default withdrawn
publications not returned)
m_rid: Message ID for specific publication versions
curve_type: Curve type (default "A01" = Sequential fixed block;
"A03" = Variable sized blocks)
"""
super().__init__(
document_type="A53",
Expand All @@ -422,7 +418,6 @@ def __init__(
business_type=business_type,
doc_status=doc_status,
m_rid=m_rid,
curve_type=curve_type,
)

# Add process type parameter specific to this endpoint
Expand Down
Loading