Skip to content

Commit

Permalink
Merge pull request #7 from DataUSA/update-tesseract
Browse files Browse the repository at this point in the history
update tesseract
  • Loading branch information
hermosillajelmy authored Jan 23, 2024
2 parents 18b43d5 + b713e5f commit da30fb5
Show file tree
Hide file tree
Showing 9 changed files with 228 additions and 212 deletions.
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ authors = ["Francisco Abarzua <[email protected]>"]
license = "MIT"

[tool.poetry.dependencies]
python = "^3.7"
python = "^3.8"
logiclayer = "^0.2.1"
logiclayer-complexity = "^0.2.1"
tesseract-olap = {extras = ["clickhouse"], version = "^0.7.0"}
tesseract-olap = {extras = ["clickhouse"], version = "^0.8.2"}
uvicorn = {extras = ["standard"], version = "^0.18.0"}

[tool.poetry.dev-dependencies]
Expand Down
88 changes: 46 additions & 42 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,42 +1,46 @@
anyio==3.7.0
asynch==0.2.2
asyncio==3.4.3
backports-zoneinfo==0.2.1
certifi==2023.5.7
ciso8601==2.3.0
click==8.1.3
clickhouse-cityhash==1.0.2.4
economic-complexity==0.1.3
exceptiongroup==1.1.1
fastapi==0.95.2
h11==0.14.0
httpcore==0.17.2
httptools==0.5.0
httpx==0.24.1
idna==3.4
immutables==0.19
leb128==1.0.5
logiclayer==0.2.1
logiclayer-complexity==0.2.1
lxml==4.9.2
lz4==4.3.2
numpy==1.24.3
orjson==3.9.0
pandas==1.5.3
pydantic==1.10.8
pypika==0.48.9
python-dateutil==2.8.2
python-dotenv==1.0.0
pytz==2023.3
pyyaml==6.0
six==1.16.0
sniffio==1.3.0
starlette==0.27.0
tesseract-olap==0.7.2
typing-extensions==4.6.3
tzlocal==5.0.1
uvicorn==0.22.0
uvloop==0.17.0
watchfiles==0.19.0
websockets==11.0.3
zstd==1.5.5.1
annotated-types==0.6.0 ; python_version >= "3.8" and python_version < "4.0"
anyio==4.2.0 ; python_version >= "3.8" and python_version < "4.0"
asynch==0.2.3 ; python_version >= "3.8" and python_version < "4.0"
asyncio==3.4.3 ; python_version >= "3.8" and python_version < "4.0"
backports-zoneinfo==0.2.1 ; python_version >= "3.8" and python_version < "3.9"
certifi==2023.11.17 ; python_version >= "3.8" and python_version < "4.0"
ciso8601==2.3.1 ; python_version >= "3.8" and python_version < "4.0"
click==8.1.7 ; python_version >= "3.8" and python_version < "4.0"
colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32" or python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows"
economic-complexity==0.1.4 ; python_version >= "3.8" and python_version < "4.0"
exceptiongroup==1.2.0 ; python_version >= "3.8" and python_version < "3.11"
fastapi==0.109.0 ; python_version >= "3.8" and python_version < "4.0"
h11==0.14.0 ; python_version >= "3.8" and python_version < "4.0"
httpcore==1.0.2 ; python_version >= "3.8" and python_version < "4.0"
httptools==0.6.1 ; python_version >= "3.8" and python_version < "4.0"
httpx==0.26.0 ; python_version >= "3.8" and python_version < "4.0"
idna==3.6 ; python_version >= "3.8" and python_version < "4.0"
immutables==0.20 ; python_version >= "3.8" and python_version < "4.0"
leb128==1.0.5 ; python_version >= "3.8" and python_version < "4.0"
logiclayer-complexity==0.2.1 ; python_version >= "3.8" and python_version < "4.0"
logiclayer==0.2.1 ; python_version >= "3.8" and python_version < "4.0"
lxml==4.9.4 ; python_version >= "3.8" and python_version < "4.0"
lz4==4.3.3 ; python_version >= "3.8" and python_version < "4.0"
numpy==1.24.4 ; python_version >= "3.8" and python_version < "4.0"
orjson==3.9.12 ; python_version >= "3.8" and python_version < "4.0"
pandas==1.5.3 ; python_version >= "3.8" and python_version < "4.0"
pydantic-core==2.14.6 ; python_version >= "3.8" and python_version < "4.0"
pydantic==2.5.3 ; python_version >= "3.8" and python_version < "4.0"
pypika==0.48.9 ; python_version >= "3.8" and python_version < "4.0"
python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "4.0"
python-dotenv==1.0.1 ; python_version >= "3.8" and python_version < "4.0"
pytz==2023.3.post1 ; python_version >= "3.8" and python_version < "4.0"
pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "4.0"
six==1.16.0 ; python_version >= "3.8" and python_version < "4.0"
sniffio==1.3.0 ; python_version >= "3.8" and python_version < "4.0"
starlette==0.35.1 ; python_version >= "3.8" and python_version < "4.0"
tesseract-olap==0.8.2 ; python_version >= "3.8" and python_version < "4.0"
tesseract-olap[clickhouse]==0.8.2 ; python_version >= "3.8" and python_version < "4.0"
typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "4.0"
tzdata==2023.4 ; python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows"
tzlocal==5.2 ; python_version >= "3.8" and python_version < "4.0"
uvicorn[standard]==0.18.3 ; python_version >= "3.8" and python_version < "4.0"
uvloop==0.19.0 ; sys_platform != "win32" and sys_platform != "cygwin" and platform_python_implementation != "PyPy" and python_version >= "3.8" and python_version < "4.0"
watchfiles==0.21.0 ; python_version >= "3.8" and python_version < "4.0"
websockets==12.0 ; python_version >= "3.8" and python_version < "4.0"
zstd==1.5.5.1 ; python_version >= "3.8" and python_version < "4.0"
165 changes: 0 additions & 165 deletions schema/acs_ygl_language_spoken_at_home_by_english_ability_2016_1.xml

This file was deleted.

2 changes: 1 addition & 1 deletion schema/bls_ces.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<Dimension name="Year" foreign_key="year" type="time">
<Annotation name="dim_type">TIME</Annotation>
<Hierarchy name="Year" primary_key="Year">
<Hierarchy name="Year" primary_key="year">
<Level name="Year" key_column="year" key_type="u16"/>
</Hierarchy>
</Dimension>
Expand Down
2 changes: 1 addition & 1 deletion schema/bls_growth_industry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<Dimension name="Year" foreign_key="year" type="time">
<Annotation name="dim_type">TIME</Annotation>
<Hierarchy name="Year" primary_key="Year">
<Hierarchy name="Year" primary_key="year">
<Level name="Year" key_column="year" key_type="u16"/>
</Hierarchy>
</Dimension>
Expand Down
2 changes: 1 addition & 1 deletion schema/bls_growth_occupation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<Dimension name="Year" foreign_key="year" type="time">
<Annotation name="dim_type">TIME</Annotation>
<Hierarchy name="Year" primary_key="Year">
<Hierarchy name="Year" primary_key="year">
<Level name="Year" key_column="year" key_type="u16"/>
</Hierarchy>
</Dimension>
Expand Down
33 changes: 33 additions & 0 deletions schema/health_estimates_of_chronically_homeless_individuals.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<Schema name="datausa" default_locale="en">
<Cube name="health_estimates_of_chronically_homeless_individuals">
<Annotation name="source_name">Department of Housing and Urban Development (HUD)</Annotation>
<Annotation name="source_description">Part 1 of the Annual Homeless Assessment Report to Congress (AHAR) provides Point-inTime (PIT) estimates, offering a snapshot of homelessness—both sheltered and unsheltered— on a single night. The PIT counts also provide an estimate of the number of people experiencing homelessness within particular homeless populations, such as people with chronic patterns of homelessness and veterans experiencing homelessness.</Annotation>
<Annotation name="source_link">http://hud.gov/</Annotation>
<Annotation name="dataset_name">The 2017 Annual Homeless Assessment Report (AHAR) to Congress, Part 1</Annotation>
<Annotation name="dataset_link">https://www.hudexchange.info/resources/documents/2017-AHAR-Part-1.pdf</Annotation>
<Annotation name="subtopic">Drivers of Health</Annotation>
<Annotation name="topic">Health</Annotation>

<Table name="health_estimates_of_chronically_homeless_individuals"/>

<Dimension name="Year" foreign_key="year" type="time">
<Hierarchy name="Year" primary_key="year">
<Level name="Year" key_column="year" key_type="u16"/>
</Hierarchy>
</Dimension>

<Dimension name="Geography" foreign_key="geo">
<Annotation name="dim_type">GEOGRAPHY</Annotation>

<Hierarchy name="State">
<Table name="states_shapes2017"/>
<Level key_column="geoid" name="State" name_column="name"/>
</Hierarchy>
</Dimension>

<Measure aggregator="median" name="Estimates of Chronically Homeless Individuals" key_column="state_chronically_homeless_individuals">
<Annotation name="details">A chronically homeless individual refers to an individual with a disability who has been continuously homeless for one year or more or has experienced at least four episodes of homelessness in the last three years where the combined length of time homeless in those occasions is at least 12 months.</Annotation>
<Annotation name="units_of_measurement">Number</Annotation>
</Measure>
</Cube>
</Schema>
42 changes: 42 additions & 0 deletions schema/health_opioid_overdose_deathrate.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<Schema name="datausa" default_locale="en">
<Cube name="health_opioid_overdose_deathrate" subset_table="true">
<Annotation name="source_name">Kaiser Family Foundation</Annotation>
<Annotation name="source_description">State Health Facts provides free, up-to-date, health data for all 50 states, the District of Columbia, the United States, counties, territories, and other geographies.</Annotation>
<Annotation name="source_link">https://www.kff.org/</Annotation>
<Annotation name="dataset_name">State Health Facts</Annotation>
<Annotation name="dataset_link">https://www.kff.org/other/state-indicator/opioid-overdose-death-rates/?currentTimeframe=0&amp;sortModel=%7B%22colId%22:%22Location%22,%22sort%22:%22asc%22%7D</Annotation>
<Annotation name="subtopic">Behavioral Health Conditions</Annotation>
<Annotation name="topic">Health</Annotation>

<Table name="health_opioid_overdose_deathrate"/>

<Dimension name="Year" foreign_key="year" type="time">
<Hierarchy name="Year">
<Level name="Year" key_column="year" key_type="u16"/>
</Hierarchy>
</Dimension>

<Dimension name="Geography" foreign_key="geo" default_hierarchy="Nation">
<Hierarchy name="Nation">
<Table name="us_nation"/>
<Level key_column="geoid" name="Nation" name_column="name"/>
</Hierarchy>

<Hierarchy name="State">
<Table name="states_shapes2017"/>
<Level key_column="geoid" name="State" name_column="name"/>
</Hierarchy>

<Hierarchy name="County">
<Table name="counties_shapes2017"/>
<Level key_column="state_id" name="State County" name_column="state_name"/>
<Level key_column="geoid" name="County" name_column="name"/>
</Hierarchy>
</Dimension>

<Measure aggregator="median" name="Opioid overdose death rate" key_column="opioid_overdose_deathrate">
<Annotation name="details">Among the deaths with drug overdose as the underlying cause, the type of opioid involved is indicated by ICD-10 multiple cause-of-death codes. Age-adjusted death rates were calculated by applying age-specific death rates to the 2000 U.S. standard population age distribution.</Annotation>
<Annotation name="units_of_measurement">People</Annotation>
</Measure>
</Cube>
</Schema>
Loading

0 comments on commit da30fb5

Please sign in to comment.