Changeset: 287cab123693 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=287cab123693
Modified Files:
clients/iotapi/requirements.txt
clients/iotapi/src/Streams/datatypes.py
clients/iotapi/src/Streams/streampolling.py
clients/iotapi/src/Streams/streams.py
clients/iotapi/src/Streams/streamscontext.py
clients/iotapi/src/Utilities/customthreading.py
clients/iotclient/requirements.txt
clients/iotclient/src/Flask/app.py
clients/iotclient/src/Flask/restresources.py
clients/iotclient/src/Settings/mapiconnection.py
clients/iotclient/src/Streams/datatypes.py
clients/iotclient/src/Streams/streampolling.py
clients/iotclient/src/Streams/streams.py
clients/iotclient/src/Streams/streamscontext.py
clients/iotclient/src/Streams/streamscreator.py
clients/iotclient/src/Utilities/customthreading.py
clients/iotclient/src/main.py
clients/iotclient/tests/datatypesinsertstests.py
clients/iotclient/tests/main.py
sql/backends/monet5/iot/Tests/ais/Tests/ais01.sql
sql/backends/monet5/iot/Tests/ais/Tests/ais02.sql
sql/backends/monet5/iot/Tests/ais/Tests/ais03.sql
sql/backends/monet5/iot/Tests/ais/Tests/ais04.sql
sql/backends/monet5/iot/Tests/ais/Tests/ais05.sql
sql/backends/monet5/iot/Tests/ais/Tests/ais06.sql
sql/backends/monet5/iot/Tests/ais/Tests/ais07.sql
sql/backends/monet5/iot/Tests/ais/Tests/ais08.sql
sql/backends/monet5/iot/Tests/ais/Tests/ais09.sql
sql/backends/monet5/iot/Tests/ais/Tests/ais10.sql
sql/backends/monet5/iot/Tests/ais/Tests/ais11.sql
sql/backends/monet5/iot/Tests/bug06.sql
Branch: iot
Log Message:
Updated ais tests and imports
diffs (truncated from 605 to 300 lines):
diff --git a/clients/iotapi/requirements.txt b/clients/iotapi/requirements.txt
--- a/clients/iotapi/requirements.txt
+++ b/clients/iotapi/requirements.txt
@@ -4,8 +4,8 @@ jsonschema>=2.5.1
python-dateutil>=2.5.3
python-monetdb>=11.19.3.2
pytz>=2016.4
-requests>=2.10.0
-Sphinx>=1.4.4
+requests>=2.11.1
+Sphinx>=1.4.6
sphinx-rtd-theme>=0.1.9
tornado>=3.2.2
tzlocal>=1.2.2
diff --git a/clients/iotapi/src/Streams/datatypes.py
b/clients/iotapi/src/Streams/datatypes.py
--- a/clients/iotapi/src/Streams/datatypes.py
+++ b/clients/iotapi/src/Streams/datatypes.py
@@ -1,9 +1,9 @@
import struct
-
from abc import ABCMeta, abstractmethod
from datetime import date, time, datetime
+from os import SEEK_END
+
from dateutil.relativedelta import relativedelta
-from os import SEEK_END
LITTLE_ENDIAN_ALIGNMENT = '<' # for now is little-endian for Intel CPU's
diff --git a/clients/iotapi/src/Streams/streampolling.py
b/clients/iotapi/src/Streams/streampolling.py
--- a/clients/iotapi/src/Streams/streampolling.py
+++ b/clients/iotapi/src/Streams/streampolling.py
@@ -1,12 +1,14 @@
from collections import OrderedDict, defaultdict
from json import dumps
+
+from Settings.iotlogger import add_log
+from Settings.mapiconnection import mapi_get_database_streams
+from Utilities.customthreading import PeriodicalThread
+
from .datatypes import TextType, LimitedTextType, SmallIntegerType,
HugeIntegerType, FloatType, DecimalType,\
BooleanType, DateType, TimeType, TimestampType, INetType, UUIDType,
IntervalType
from .streams import IOTStream
from .streamscontext import Streams_Context
-from Settings.iotlogger import add_log
-from Settings.mapiconnection import mapi_get_database_streams
-from Utilities.customthreading import PeriodicalThread
Switcher = [{'types': ['clob', 'url'], 'class': TextType},
{'types': ['char', 'varchar'], 'class': LimitedTextType},
diff --git a/clients/iotapi/src/Streams/streams.py
b/clients/iotapi/src/Streams/streams.py
--- a/clients/iotapi/src/Streams/streams.py
+++ b/clients/iotapi/src/Streams/streams.py
@@ -1,11 +1,11 @@
import os
+from collections import OrderedDict
-from collections import OrderedDict
-from watchdog.events import FileSystemEventHandler, DirCreatedEvent,
DirDeletedEvent
-from watchdog.observers import Observer
from Settings.filesystem import get_baskets_base_location
from Utilities.readwritelock import RWLock
from WebSockets.websockets import notify_stream_inserts_to_clients
+from watchdog.events import FileSystemEventHandler, DirCreatedEvent,
DirDeletedEvent
+from watchdog.observers import Observer
def represents_int(s):
diff --git a/clients/iotapi/src/Streams/streamscontext.py
b/clients/iotapi/src/Streams/streamscontext.py
--- a/clients/iotapi/src/Streams/streamscontext.py
+++ b/clients/iotapi/src/Streams/streamscontext.py
@@ -1,4 +1,5 @@
from collections import OrderedDict
+
from Utilities.readwritelock import RWLock
from WebSockets.websockets import unsubscribe_removed_streams
diff --git a/clients/iotapi/src/Utilities/customthreading.py
b/clients/iotapi/src/Utilities/customthreading.py
--- a/clients/iotapi/src/Utilities/customthreading.py
+++ b/clients/iotapi/src/Utilities/customthreading.py
@@ -1,5 +1,5 @@
+from threading import Thread, Event
from time import sleep
-from threading import Thread, Event
class StoppableThread(Thread):
diff --git a/clients/iotclient/requirements.txt
b/clients/iotclient/requirements.txt
--- a/clients/iotclient/requirements.txt
+++ b/clients/iotclient/requirements.txt
@@ -1,4 +1,4 @@
-fake-factory>=0.5.9
+fake-factory>=0.6.0
Flask-RESTful>=0.3.5
IPy>=0.83
jsonschema>=2.5.1
@@ -6,7 +6,7 @@ python-dateutil>=2.5.3
python-monetdb>=11.19.3.2
pytz>=2016.4
rfc3987>=1.3.6
-Sphinx>=1.4.4
+Sphinx>=1.4.6
sphinx-rtd-theme>=0.1.9
strict-rfc3339>=0.7
tzlocal>=1.2.2
diff --git a/clients/iotclient/src/Flask/app.py
b/clients/iotclient/src/Flask/app.py
--- a/clients/iotclient/src/Flask/app.py
+++ b/clients/iotclient/src/Flask/app.py
@@ -1,5 +1,6 @@
from flask import Flask
from flask_restful import Api
+
from .restresources import StreamInput, StreamsInfo, StreamsHandling
diff --git a/clients/iotclient/src/Flask/restresources.py
b/clients/iotclient/src/Flask/restresources.py
--- a/clients/iotclient/src/Flask/restresources.py
+++ b/clients/iotclient/src/Flask/restresources.py
@@ -1,11 +1,13 @@
from collections import OrderedDict
from datetime import datetime
+from json import loads
+
from flask import request
from flask_restful import Resource
-from json import loads
from jsonschema import Draft4Validator, FormatChecker, ValidationError
from pytz import utc
from tzlocal import get_localzone
+
from Settings.iotlogger import add_log
from Streams.jsonschemas import get_create_streams_schema,
DELETE_STREAMS_SCHEMA
from Streams.streamscontext import get_streams_context
diff --git a/clients/iotclient/src/Settings/mapiconnection.py
b/clients/iotclient/src/Settings/mapiconnection.py
--- a/clients/iotclient/src/Settings/mapiconnection.py
+++ b/clients/iotclient/src/Settings/mapiconnection.py
@@ -1,4 +1,5 @@
from monetdb.sql import connect
+
from .iotlogger import add_log
diff --git a/clients/iotclient/src/Streams/datatypes.py
b/clients/iotclient/src/Streams/datatypes.py
--- a/clients/iotclient/src/Streams/datatypes.py
+++ b/clients/iotclient/src/Streams/datatypes.py
@@ -1,16 +1,15 @@
import struct
-
from abc import ABCMeta, abstractmethod
-from collections import OrderedDict
from copy import deepcopy
from datetime import datetime, timedelta
-from dateutil import parser
from itertools import chain
from json import dumps
from math import ceil, log10
from re import compile, split
-from jsonschemas import UUID_REGEX, MAC_ADDRESS_REGEX, TIME_REGEX, IPV4_REGEX,
TIME_WITH_TIMEZONE_TYPE_INTERNAL,\
- TIME_WITH_TIMEZONE_TYPE_EXTERNAL, TIMESTAMP_WITH_TIMEZONE_TYPE_INTERNAL,
TIMESTAMP_WITH_TIMEZONE_TYPE_EXTERNAL
+
+from dateutil import parser
+
+from jsonschemas import UUID_REGEX, MAC_ADDRESS_REGEX, TIME_REGEX, IPV4_REGEX
# The null constants might change from system to system due to different CPU's
limits
LITTLE_ENDIAN_ALIGNMENT = '<' # for now it is little-endian
diff --git a/clients/iotclient/src/Streams/streampolling.py
b/clients/iotclient/src/Streams/streampolling.py
--- a/clients/iotclient/src/Streams/streampolling.py
+++ b/clients/iotclient/src/Streams/streampolling.py
@@ -1,6 +1,11 @@
from collections import OrderedDict, defaultdict
from json import dumps
+
+from Utilities.customthreading import PeriodicalThread
from jsonschema import Draft4Validator, FormatChecker
+
+from Settings.iotlogger import add_log
+from Settings.mapiconnection import init_monetdb_connection,
mapi_get_database_streams
from .datatypes import TextType, LimitedTextType, SmallIntegerType,
HugeIntegerType, FloatType, DecimalType, DateType,\
TimeType, TimestampType, IntervalType, BooleanType, INetType, INetSixType,
MACType, URLType, UUIDType, RegexType,\
EnumType, ENUM_TYPE_SEPARATOR
@@ -12,9 +17,6 @@ from .jsonschemas import UNBOUNDED_TEXT_
from .streams import TupleBasedStream, TimeBasedStream, AutoFlushedStream,
IMPLICIT_TIMESTAMP_COLUMN_NAME,\
HOST_IDENTIFIER_COLUMN_NAME
from .streamscontext import get_streams_context
-from Settings.iotlogger import add_log
-from Settings.mapiconnection import init_monetdb_connection,
mapi_get_database_streams
-from Utilities.customthreading import PeriodicalThread
Switcher = [{'types': [UNBOUNDED_TEXT_TYPE], 'class': TextType},
{'types': BOUNDED_TEXT_TYPES, 'class': LimitedTextType},
diff --git a/clients/iotclient/src/Streams/streams.py
b/clients/iotclient/src/Streams/streams.py
--- a/clients/iotclient/src/Streams/streams.py
+++ b/clients/iotclient/src/Streams/streams.py
@@ -1,16 +1,17 @@
import os
-
from abc import ABCMeta, abstractmethod
from collections import defaultdict, OrderedDict
from json import dumps
from shutil import rmtree
-from .datatypes import TimestampType, TextType
+
+from Utilities.customthreading import PeriodicalThread
+from Utilities.filecreator import create_file_if_not_exists
+from Utilities.readwritelock import RWLock
+
from Settings.filesystem import get_baskets_location
from Settings.iotlogger import add_log
from Settings.mapiconnection import close_monetdb_connection,
mapi_flush_baskets
-from Utilities.filecreator import create_file_if_not_exists
-from Utilities.readwritelock import RWLock
-from Utilities.customthreading import PeriodicalThread
+from .datatypes import TimestampType, TextType
IMPLICIT_TIMESTAMP_COLUMN_NAME = 'implicit_timestamp'
Implicit_Timestamp_Handler =
TimestampType(name=IMPLICIT_TIMESTAMP_COLUMN_NAME, type="timestamp with time
zone")
diff --git a/clients/iotclient/src/Streams/streamscontext.py
b/clients/iotclient/src/Streams/streamscontext.py
--- a/clients/iotclient/src/Streams/streamscontext.py
+++ b/clients/iotclient/src/Streams/streamscontext.py
@@ -1,7 +1,9 @@
from collections import OrderedDict
+
+from Utilities.readwritelock import RWLock
+
+from Settings.mapiconnection import mapi_create_stream, mapi_delete_stream,
init_monetdb_connection
from .streamscreator import validate_schema_and_create_stream
-from Settings.mapiconnection import mapi_create_stream, mapi_delete_stream,
init_monetdb_connection
-from Utilities.readwritelock import RWLock
Streams_Context = None
diff --git a/clients/iotclient/src/Streams/streamscreator.py
b/clients/iotclient/src/Streams/streamscreator.py
--- a/clients/iotclient/src/Streams/streamscreator.py
+++ b/clients/iotclient/src/Streams/streamscreator.py
@@ -1,6 +1,9 @@
from collections import OrderedDict
from json import dumps
+
from jsonschema import Draft4Validator, FormatChecker
+
+from Settings.mapiconnection import init_monetdb_connection
from .datatypes import TextType, LimitedTextType, SmallIntegerType, FloatType,
DecimalType, DateType, EnumType,\
HugeIntegerType, TimeType, TimestampType, IntervalType, BooleanType,
INetType, INetSixType, MACType, URLType,\
UUIDType, RegexType
@@ -10,7 +13,6 @@ from .jsonschemas import UNBOUNDED_TEXT_
TIMED_FLUSH_IDENTIFIER, TUPLE_FLUSH_IDENTIFIER
from .streams import TupleBasedStream, TimeBasedStream, AutoFlushedStream,
IMPLICIT_TIMESTAMP_COLUMN_NAME,\
HOST_IDENTIFIER_COLUMN_NAME
-from Settings.mapiconnection import init_monetdb_connection
Switcher = [{'types': UNBOUNDED_TEXT_INPUTS, 'class': TextType},
{'types': BOUNDED_TEXT_INPUTS, 'class': LimitedTextType},
diff --git a/clients/iotclient/src/Utilities/customthreading.py
b/clients/iotclient/src/Utilities/customthreading.py
--- a/clients/iotclient/src/Utilities/customthreading.py
+++ b/clients/iotclient/src/Utilities/customthreading.py
@@ -1,5 +1,5 @@
+from threading import Thread, Event
from time import sleep
-from threading import Thread, Event
class StoppableThread(Thread):
diff --git a/clients/iotclient/src/main.py b/clients/iotclient/src/main.py
--- a/clients/iotclient/src/main.py
+++ b/clients/iotclient/src/main.py
@@ -4,21 +4,22 @@ import os
import signal
import sys
import time
-
-from IPy import IP
from multiprocessing import Process
from threading import Thread
from uuid import getnode as get_mac
+
+from IPy import IP
+
from Flask.app import start_flask_iot_app, start_flask_admin_app
from Flask.restresources import init_rest_resources
from Settings.filesystem import init_file_system, DEFAULT_FILESYSTEM
from Settings.iotlogger import init_logging, add_log, DEFAULT_LOGGING
from Settings.mapiconnection import init_monetdb_connection, check_hugeint_type
+from Streams.jsonschemas import init_create_streams_schema
+from Streams.streampolling import polling_add_hugeint_type,
init_stream_polling_thread
from Streams.streams import init_streams_hosts
-from Streams.jsonschemas import init_create_streams_schema
from Streams.streamscontext import init_streams_context
from Streams.streamscreator import creator_add_hugeint_type
-from Streams.streampolling import polling_add_hugeint_type,
init_stream_polling_thread
subprocess = None
diff --git a/clients/iotclient/tests/datatypesinsertstests.py
b/clients/iotclient/tests/datatypesinsertstests.py
--- a/clients/iotclient/tests/datatypesinsertstests.py
+++ b/clients/iotclient/tests/datatypesinsertstests.py
@@ -1,11 +1,12 @@
from abc import ABCMeta, abstractmethod
-from faker import Factory
-from pytz import timezone
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
