Merge pull request #8 from DataUSA/develop

April Deployment

helm/development.yaml

@@ -69,8 +69,9 @@ ingress:
     cert-manager.io/cluster-issuer: "letsencrypt-prod"
     acme.cert-manager.io/http01-edit-in-place: "true"
     ingress.kubernetes.io/ssl-redirect: "true"
-    nginx.org/proxy-connect-timeout: "120s"
-    nginx.org/proxy-read-timeout: "120s"
+    nginx.org/proxy-connect-timeout: "480s"
+    nginx.org/proxy-read-timeout: "480s"
+    nginx.org/proxy-send-timeout: "480s"
     nginx.org/proxy-buffers: "8 16k"
     nginx.org/proxy-buffer-size: "16k"
     nginx.org/proxy-busy-buffers-size: "64k"

helm/production.yaml

@@ -76,11 +76,13 @@ ingress:
     nginx.org/proxy-busy-buffers-size: "64k"
     nginx.org/location-snippets: |
       add_header Access-Control-Allow-Origin *;
-  hosts:
-    - host: api-prod.datausa.io
+  customHosts:
+    - host: api-varnish.datausa.io
       paths:
-        - /
+        - path: /
+          service: varnish-tesseract-api
+          port: 8080
   tls:
     - secretName: tesseract-api-ingress-tls
       hosts: 
-        - api-prod.datausa.io
+        - api-varnish.datausa.io

helm/templates/ingress.yaml

@@ -26,18 +26,35 @@ spec:
     {{- end }}
   {{- end }}
   rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- range .paths }}
-          - path: {{ . }}
-            pathType: Prefix
-            backend:
-              service:
-                name: {{ $fullName }}
-                port:
-                  number: {{ $servicePort }}
-          {{- end }}
-    {{- end }}
+    {{ if .Values.ingress.customHosts }}
+      {{- range .Values.ingress.customHosts }}
+      - host: {{ .host | quote }}
+        http:
+          paths:
+            {{- range .paths }}
+            - path: {{ .path }}
+              pathType: Prefix
+              backend:
+                service:
+                  name: {{ .service }}
+                  port:
+                    number: {{ .port }}
+            {{- end }}
+      {{- end }}
+    {{ else }}
+      {{- range .Values.ingress.hosts }}
+      - host: {{ .host | quote }}
+        http:
+          paths:
+            {{- range .paths }}
+            - path: {{ . }}
+              pathType: Prefix
+              backend:
+                service:
+                  name: {{ $fullName }}
+                  port:
+                    number: {{ $servicePort }}
+            {{- end }}
+      {{- end }}
+    {{ end }}
 {{- end }}

pyproject.toml

@@ -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"}
+logiclayer-complexity = "^0.4.1"
+tesseract-olap = {extras = ["clickhouse"], version = "^0.8.3"}
 uvicorn = {extras = ["standard"], version = "^0.18.0"}
 
 [tool.poetry.dev-dependencies]

requirements.txt

@@ -1,42 +1,47 @@
-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.3.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==2024.2.2 ; 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.2.2 ; python_version >= "3.8" and python_version < "4.0"
+exceptiongroup==1.2.0 ; python_version >= "3.8" and python_version < "3.11"
+fastapi==0.110.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.4 ; python_version >= "3.8" and python_version < "4.0"
+httptools==0.6.1 ; python_version >= "3.8" and python_version < "4.0"
+httpx==0.27.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.7 ; python_version >= "3.8" and python_version < "4.0"
+logiclayer-complexity==0.4.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 < "3.9"
+numpy==1.26.4 ; python_version >= "3.9" and python_version < "4.0"
+orjson==3.9.15 ; python_version >= "3.8" and python_version < "4.0"
+pandas==2.0.3 ; python_version >= "3.8" and python_version < "4.0"
+pydantic-core==2.16.3 ; python_version >= "3.8" and python_version < "4.0"
+pydantic==2.6.4 ; 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.9.0.post0 ; python_version >= "3.8" and python_version < "4.0"
+python-dotenv==1.0.1 ; python_version >= "3.8" and python_version < "4.0"
+pytz==2024.1 ; 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.1 ; python_version >= "3.8" and python_version < "4.0"
+starlette==0.36.3 ; python_version >= "3.8" and python_version < "4.0"
+tesseract-olap==0.8.3 ; python_version >= "3.8" and python_version < "4.0"
+tesseract-olap[clickhouse]==0.8.3 ; python_version >= "3.8" and python_version < "4.0"
+typing-extensions==4.10.0 ; python_version >= "3.8" and python_version < "4.0"
+tzdata==2024.1 ; python_version >= "3.8" and python_version < "4.0"
+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"

schema/bls_ces.xml

@@ -0,0 +1,37 @@
+<Schema name="datausa" default_locale="en">
+    <Cube name="bls_ces">
+        <Annotation name="source_name">Bureau of Labor Statistics</Annotation>
+        <Annotation name="source_description">The Bureau of Labor Statistics (BLS) of the U.S. Department of Labor is the principal federal agency responsible for measuring labor market activity, working conditions, and price changes in the economy.</Annotation>
+        <Annotation name="dataset_name">Current Employment Statistics</Annotation>
+        <Annotation name="dataset_link">https://www.bls.gov/ces/</Annotation>
+        <Annotation name="topic">Economy</Annotation>
+        <Annotation name="subtopic">Industry</Annotation>
+
+        <Table name="bls_ces"/>
+
+        <Dimension name="Year" foreign_key="year" type="time">  
+            <Annotation name="dim_type">TIME</Annotation>
+            <Hierarchy name="Year" primary_key="year">
+                <Level name="Year" key_column="year" key_type="u16"/>
+            </Hierarchy>
+        </Dimension>
+
+        <DimensionUsage name="BLS Industry Flat" source="BLS Industry Flat" foreign_key="naics_code" />
+
+        <Measure aggregator="avg" key_column="avg_hrly_earnings" name="Industry Average Hourly Earnings" visible="true">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">AVG</Annotation>
+            <Annotation name="units_of_measurement">USD</Annotation>
+        </Measure>
+        <Measure aggregator="avg" key_column="avg_weekly_hours" name="Industry Average Weekly Hours" visible="true">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">AVG</Annotation>
+            <Annotation name="units_of_measurement">Hours</Annotation>
+        </Measure>
+        <Measure aggregator="sum" key_column="employees_thousands" name="Industry Employees Thousands" visible="true">
+            <Annotation name="aggregation_method">NONE</Annotation>
+            <Annotation name="pre_aggregation_method">SUM</Annotation>
+            <Annotation name="units_of_measurement">Employees</Annotation>
+        </Measure>
+    </Cube>
+</Schema>