changeset 1248:c4c50678c856

clean api update in sqlalchemy
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 15 Feb 2024 14:09:23 -0500
parents 439207b6c146
children 2aa56b101041
files trafficintelligence/iframework.py trafficintelligence/metadata.py
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/trafficintelligence/iframework.py	Mon Feb 12 16:47:33 2024 -0500
+++ b/trafficintelligence/iframework.py	Thu Feb 15 14:09:23 2024 -0500
@@ -4,9 +4,9 @@
 from pathlib import Path
 from datetime import datetime
 
-from sqlalchemy.ext.declarative import declarative_base, declared_attr
+from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy import Table, Column, Integer, Boolean, String, Float, DateTime, Enum as SQLEnum, ForeignKey, CheckConstraint, create_engine
-from sqlalchemy.orm import relationship, backref, sessionmaker
+from sqlalchemy.orm import relationship, backref, sessionmaker, declarative_base
 
 Base = declarative_base()
 
--- a/trafficintelligence/metadata.py	Mon Feb 12 16:47:33 2024 -0500
+++ b/trafficintelligence/metadata.py	Thu Feb 15 14:09:23 2024 -0500
@@ -6,8 +6,7 @@
 from numpy import zeros, loadtxt, array
 
 from sqlalchemy import orm, create_engine, Column, Integer, Float, DateTime, String, ForeignKey, Boolean, Interval
-from sqlalchemy.orm import relationship, backref, sessionmaker
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship, backref, sessionmaker, declarative_base
 
 from trafficintelligence.utils import datetimeFormat, removeExtension, getExtension, TimeConverter
 from trafficintelligence.cvutils import computeUndistortMaps, videoFilenameExtensions, infoVideo