Skip to content

Commit bf8ed16

Browse files
author
Federico Rossi
committed
Updated docker python 3.12, requirements, code refactoring
1 parent b6b44d8 commit bf8ed16

5 files changed

Lines changed: 13 additions & 11 deletions

File tree

database-parser/python/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.8
1+
FROM python:3.12
22

33
COPY ./database-parser/requirements.txt /requirements.txt
44

database-parser/python/app/data/__init__.py

Whitespace-only changes.

database-parser/python/app/data/data_extraction.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import threading
22
import logging
3-
from datetime import datetime
3+
import datetime
44
from logging.config import dictConfig
55
import json
66
import requests
7-
from sqlalchemy import create_engine, Table, MetaData, text, select
7+
from sqlalchemy import create_engine, Table, MetaData, text
88
from sqlalchemy.orm import Session
99
from sqlalchemy.inspection import inspect
1010
from .util.utility import post_message, validate_model
@@ -41,7 +41,7 @@ def __init__(self, dialect, driver, user, password, host,
4141

4242
def manage_data(self, results, primary_keys):
4343
row_numbers = 0
44-
end_timestamp = datetime.utcnow().timestamp() * 1000
44+
end_timestamp = datetime.datetime.now(datetime.UTC).timestamp() * 1000
4545

4646
self.status_logger.info("Posting rows")
4747

@@ -101,7 +101,7 @@ def extract_recent(self):
101101
query = query.where(text(self.where))
102102

103103
results = session.execute(query)
104-
primary_keys = [key.name for key in inspect(table).primary_key]
104+
primary_keys = [key.name for key in inspect(table).primary_key()]
105105
self.manage_data(results, primary_keys)
106106

107107
except requests.RequestException:
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1+
from typing import Dict
2+
13
from pydantic import BaseModel
24

35

46
class LogConfig(BaseModel):
57
"""Logging configuration to be set for the server"""
68

7-
LOGGER_NAME: str = "mycoolapp"
9+
LOGGER_NAME: str = "database-parser"
810
LOG_FORMAT: str = "%(levelprefix)s | %(asctime)s | %(message)s"
911
LOG_LEVEL: str = "DEBUG"
1012

1113
# Logging config
12-
version = 1
13-
disable_existing_loggers = False
14-
formatters = {
14+
version: int = 1
15+
disable_existing_loggers: bool = False
16+
formatters: Dict = {
1517
"default": {
1618
"()": "uvicorn.logging.DefaultFormatter",
1719
"fmt": LOG_FORMAT,
1820
"datefmt": "%Y-%m-%d %H:%M:%S",
1921
},
2022
}
21-
handlers = {
23+
handlers: Dict = {
2224
"default": {
2325
"formatter": "default",
2426
"class": "logging.StreamHandler",
2527
"stream": "ext://sys.stderr",
2628
},
2729
}
28-
loggers = {
30+
loggers: Dict = {
2931
"database-parser": {"handlers": ["default"], "level": LOG_LEVEL},
3032
}
60 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)