cmsdials 0.2.1__tar.gz → 0.3.0__tar.gz

{cmsdials-0.2.1 → cmsdials-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cmsdials
-Version: 0.2.1
+Version: 0.3.0
 Summary: The Python api client interface to DIALS service
 Home-page: https://github.com/cms-DQM/dials-py
 Author: Gabriel Moreira
@@ -15,8 +15,9 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: pydantic (>=2.6.3,<3.0.0)
+Requires-Dist: pydantic (>=1,<2)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
+Requires-Dist: typing-extensions (>=3.6.6,<4.6.0)
 Project-URL: Repository, https://github.com/cms-DQM/dials-py
 Description-Content-Type: text/markdown
 
@@ -78,7 +79,7 @@ creds = Credentials.from_creds_file()
 dials = Dials(creds, nthreads=2)
 
 # Getting h1d data
-data = dials.h1d.list_all(LumisectionHistogram1DFilters(title="PixelPhase1/Tracks/PXBarrel/charge_PXLayer_2"))
+data = dials.h1d.list_all(LumisectionHistogram1DFilters(title="PixelPhase1/Tracks/PXBarrel/charge_PXLayer_2"), max_pages=5)
 ```
 
 ## Available endpoints
@@ -146,11 +147,11 @@ dials.file_index.list(FileIndexFilters(page="10"))
 
 dials.h1d.list(LumisectionHistogram1DFilters(title="PixelPhase1/Tracks/PXBarrel/charge_PXLayer_2", page="15"))
 
-dials.h2d.list_all(LumisectionHistogram2DFilters(title_contains="EEOT digi occupancy EE +", min_entries=100, min_run_number=360392, max_run_number=365000))
+dials.h2d.list_all(LumisectionHistogram2DFilters(title_contains="EEOT digi occupancy EE +", min_entries=100, min_run_number=360392, max_run_number=365000), max_pages=5)
 
-dials.lumi.list_all(LumisectionFilters(run_number=360392))
+dials.lumi.list_all(LumisectionFilters(run_number=360392), max_pages=5)
 
-dials.run.list_all(RunFilters(min_run_number=360392, max_run_number=365000))
+dials.run.list_all(RunFilters(min_run_number=360392, max_run_number=365000), max_pages=5)
 ```
 
 ### Dials MEs
@@ -178,6 +179,6 @@ auth = AuthClient(base_url=DEV_URL)
 creds = Credentials.from_creds_file(cache_dir=DEV_CACHE_DIR, client=auth)  # Make sure to specify the auth client with overwritten values, using another cache_dir is recommended
 dials = Dials(creds, nthreads=2, base_url=DEV_URL)
 
-dials.h2d.list_all(LumisectionHistogram2DFilters(title_contains="EEOT digi occupancy EE +", min_entries=100, min_run_number=360392, max_run_number=365000))
+dials.h2d.list_all(LumisectionHistogram2DFilters(title_contains="EEOT digi occupancy EE +", min_entries=100, min_run_number=360392, max_run_number=365000), max_pages=5)
 ```
 

{cmsdials-0.2.1 → cmsdials-0.3.0}/README.md

@@ -56,7 +56,7 @@ creds = Credentials.from_creds_file()
 dials = Dials(creds, nthreads=2)
 
 # Getting h1d data
-data = dials.h1d.list_all(LumisectionHistogram1DFilters(title="PixelPhase1/Tracks/PXBarrel/charge_PXLayer_2"))
+data = dials.h1d.list_all(LumisectionHistogram1DFilters(title="PixelPhase1/Tracks/PXBarrel/charge_PXLayer_2"), max_pages=5)
 ```
 
 ## Available endpoints
@@ -124,11 +124,11 @@ dials.file_index.list(FileIndexFilters(page="10"))
 
 dials.h1d.list(LumisectionHistogram1DFilters(title="PixelPhase1/Tracks/PXBarrel/charge_PXLayer_2", page="15"))
 
-dials.h2d.list_all(LumisectionHistogram2DFilters(title_contains="EEOT digi occupancy EE +", min_entries=100, min_run_number=360392, max_run_number=365000))
+dials.h2d.list_all(LumisectionHistogram2DFilters(title_contains="EEOT digi occupancy EE +", min_entries=100, min_run_number=360392, max_run_number=365000), max_pages=5)
 
-dials.lumi.list_all(LumisectionFilters(run_number=360392))
+dials.lumi.list_all(LumisectionFilters(run_number=360392), max_pages=5)
 
-dials.run.list_all(RunFilters(min_run_number=360392, max_run_number=365000))
+dials.run.list_all(RunFilters(min_run_number=360392, max_run_number=365000), max_pages=5)
 ```
 
 ### Dials MEs
@@ -156,5 +156,5 @@ auth = AuthClient(base_url=DEV_URL)
 creds = Credentials.from_creds_file(cache_dir=DEV_CACHE_DIR, client=auth)  # Make sure to specify the auth client with overwritten values, using another cache_dir is recommended
 dials = Dials(creds, nthreads=2, base_url=DEV_URL)
 
-dials.h2d.list_all(LumisectionHistogram2DFilters(title_contains="EEOT digi occupancy EE +", min_entries=100, min_run_number=360392, max_run_number=365000))
+dials.h2d.list_all(LumisectionHistogram2DFilters(title_contains="EEOT digi occupancy EE +", min_entries=100, min_run_number=360392, max_run_number=365000), max_pages=5)
 ```

{cmsdials-0.2.1 → cmsdials-0.3.0}/cmsdials/clients/bad_file_index/models.py

@@ -1,6 +1,7 @@
+from datetime import datetime
 from typing import List, Optional
 
-from pydantic import AnyUrl, AwareDatetime, BaseModel, Field
+from pydantic import AnyUrl, BaseModel, Field
 
 from ...utils.base_model import OBaseModel
 
@@ -10,8 +11,8 @@ class BadFileIndex(BaseModel):
     file_path: str = Field(..., description="Path where the file is stored", max_length=255)
     data_era: str = Field(..., description="The era that the data refers to (e.g. 2018A)", max_length=7)
     st_size: float = Field(..., description="The data file's size in bytes")
-    st_ctime: AwareDatetime = Field(..., description="Time of files's last status change in filesystem")
-    st_itime: AwareDatetime = Field(..., description="Time when file was indexed in database")
+    st_ctime: datetime = Field(..., description="Time of files's last status change in filesystem")
+    st_itime: datetime = Field(..., description="Time when file was indexed in database")
     err: str = Field(..., description="Error message", max_length=255)
 
 

{cmsdials-0.2.1 → cmsdials-0.3.0}/cmsdials/clients/file_index/models.py

@@ -1,6 +1,7 @@
+from datetime import datetime
 from typing import List, Optional
 
-from pydantic import AnyUrl, AwareDatetime, BaseModel, Field
+from pydantic import AnyUrl, BaseModel, Field
 
 from ...utils.base_model import OBaseModel
 
@@ -19,8 +20,8 @@ class FileIndex(BaseModel):
         description="Number of histogram entries that have been extracted from the file",
     )
     st_size: float = Field(..., description="The data file's size in bytes")
-    st_ctime: AwareDatetime = Field(..., description="Time of files's last status change in filesystem")
-    st_itime: AwareDatetime = Field(..., description="Time when file was indexed in database")
+    st_ctime: datetime = Field(..., description="Time of files's last status change in filesystem")
+    st_itime: datetime = Field(..., description="Time when file was indexed in database")
     status: str = Field(
         ...,
         description="Indicate the processing status of run-histogram within the file",

{cmsdials-0.2.1 → cmsdials-0.3.0}/cmsdials/clients/h1d/models.py

@@ -1,6 +1,7 @@
+from datetime import datetime
 from typing import List, Optional
 
-from pydantic import AnyUrl, AwareDatetime, BaseModel, Field
+from pydantic import AnyUrl, BaseModel, Field
 
 from ...utils.base_model import OBaseModel
 
@@ -9,7 +10,7 @@ class LumisectionHistogram1D(BaseModel):
     id: int
     ls_number: int
     run_number: int
-    date: AwareDatetime
+    date: datetime
     title: str = Field(..., max_length=220)
     entries: int
     data: list[float]
@@ -39,3 +40,5 @@ class LumisectionHistogram1DFilters(OBaseModel):
     run_number: Optional[int] = None
     title: Optional[str] = None
     title_contains: Optional[str] = None
+    era: Optional[str] = None
+    dqmio_filepath_contains: Optional[str] = None

{cmsdials-0.2.1 → cmsdials-0.3.0}/cmsdials/clients/h2d/models.py

@@ -1,6 +1,7 @@
+from datetime import datetime
 from typing import Optional
 
-from pydantic import AnyUrl, AwareDatetime, BaseModel, Field
+from pydantic import AnyUrl, BaseModel, Field
 
 from ...utils.base_model import OBaseModel
 
@@ -9,7 +10,7 @@ class LumisectionHistogram2D(BaseModel):
     id: int
     ls_number: int
     run_number: int
-    date: AwareDatetime
+    date: datetime
     title: str = Field(..., max_length=220)
     entries: int
     data: list[list[float]]
@@ -45,3 +46,5 @@ class LumisectionHistogram2DFilters(OBaseModel):
     run_number: Optional[int] = None
     title: Optional[str] = None
     title_contains: Optional[str] = None
+    era: Optional[str] = None
+    dqmio_filepath_contains: Optional[str] = None

{cmsdials-0.2.1 → cmsdials-0.3.0}/cmsdials/clients/lumisection/models.py

@@ -1,6 +1,7 @@
+from datetime import datetime
 from typing import List, Optional
 
-from pydantic import AnyUrl, AwareDatetime, BaseModel
+from pydantic import AnyUrl, BaseModel
 
 from ...utils.base_model import OBaseModel
 
@@ -8,7 +9,7 @@ from ...utils.base_model import OBaseModel
 class Lumisection(BaseModel):
     id: int
     ls_number: int
-    date: AwareDatetime
+    date: datetime
     oms_zerobias_rate: Optional[float]
     run: int
 

{cmsdials-0.2.1 → cmsdials-0.3.0}/cmsdials/clients/run/models.py

@@ -1,16 +1,17 @@
+from datetime import datetime
 from typing import Optional
 
-from pydantic import AnyUrl, AwareDatetime, BaseModel, Field
+from pydantic import AnyUrl, BaseModel, Field
 
 from ...utils.base_model import OBaseModel
 
 
 class Run(BaseModel):
     run_number: int
-    run_date: Optional[AwareDatetime]
+    run_date: Optional[datetime]
     year: Optional[int]
     period: Optional[str] = Field(..., max_length=1)
-    date: AwareDatetime
+    date: datetime
     oms_fill: Optional[int]
     oms_lumisections: Optional[int]
     oms_initial_lumi: Optional[float]

{cmsdials-0.2.1 → cmsdials-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cmsdials"
-version = "0.2.1"
+version = "0.3.0"
 description = "The Python api client interface to DIALS service"
 authors = ["Gabriel Moreira <gabrielmscampos@gmail.com>"]
 readme = "README.md"
@@ -18,8 +18,9 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.9"
-pydantic = "^2.6.3"
 requests = "^2.31.0"
+pydantic = "<2, >=1"
+typing-extensions = "<4.6.0, >=3.6.6"
 
 
 [tool.poetry.group.dev.dependencies]