nilm/nilmdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
175 Commits 3 Branches 64 Tags 3.2 MiB
bxinterval-last
Commit Graph

175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Paris
0808ed5bd8 Add datetime_tz module from python-datetime-tz repository. This could 
go away if it gets packaged in Debian etc.

Add nilmdb.timestamper classes

Start test_timestamper (needs work)

Number the functions in test_client so they run in the right order to
leave the database in a good state.

Fix some brokenness with module importing and namespaces



git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10643 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-24 17:32:11 +00:00
Jim Paris
ec25eac697 Misc cleanups, fix some pylint issues 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10642 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-23 15:50:33 +00:00
Jim Paris
09340d543d Add some test prep data 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10641 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-23 14:56:52 +00:00
Jim Paris
913883be3a Fix slow database stuff in testing by setting PRAGMA synchronous=OFF. Default is still FULL for production use, though 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10639 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-22 22:06:08 +00:00
Jim Paris
8cc1dff0b8 Cleanup 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10637 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-22 21:00:01 +00:00
Jim Paris
5b2d52b8bc Big rework of how errors are handled and propagated to the HTTP 
response.  Now everything (status code, message, possibly tracebacks)
are passed to the client as JSON, so the client can display correct errors.
Nice!


git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10630 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-22 00:14:13 +00:00
Jim Paris
22ef82b59c More work on client tests 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10625 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-21 16:28:51 +00:00
Jim Paris
a235c94c02 More work towards filling out the client... 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10624 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-20 22:21:16 +00:00
Jim Paris
795d2ac7cf ignore 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10623 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-20 21:46:37 +00:00
Jim Paris
1c4efb92c6 rename command line client nilmdb.py to nilmtool.py 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10622 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-20 21:46:18 +00:00
Jim Paris
56a1770f45 client tests 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10611 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-20 14:26:29 +00:00
Jim Paris
b766aef257 new client py 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10610 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-20 14:22:02 +00:00
Jim Paris
3e5d0ef87d rename 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10609 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-20 14:21:55 +00:00
Jim Paris
a26468c059 Rename client -> cmdline 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10608 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-20 14:19:45 +00:00
Jim Paris
0099a41fd8 Work on a client implementation that can survive testing 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10604 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-20 01:18:30 +00:00
Jim Paris
b1baacf272 cleanup 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10600 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-19 21:36:24 +00:00
Jim Paris
8afaf8f329 Improve insert strutcure 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10562 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-14 20:29:30 +00:00
Jim Paris
610860c379 Update 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10556 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-13 22:12:30 +00:00
Jim Paris
c076af64af for reference 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10548 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-12 20:19:32 +00:00
Jim Paris
d0435cbf91 for reference 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10547 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-12 20:19:29 +00:00
Jim Paris
ace199ffa8 Working client-side pycurl code to send a streaming chunked PUT. 
Working server-side cherrypy code to receive a streaming chunked PUT.


git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10546 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-03-12 20:09:17 +00:00
Jim Paris
5b89fa7ccf Fix style 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10446 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-02-21 21:30:53 +00:00
Jim Paris
d8929467eb Cleanup 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10445 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-02-20 06:13:54 +00:00
Jim Paris
ba66668fff playing with coverage a bit 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10444 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-02-20 06:09:42 +00:00
Jim Paris
1e1c7fa9c4 Create StreamException class in NilmDB, which can get caught and 
handled by the HTTP server.

Add /stream/get_metadata HTTP request.

Fill out test_stream_metadata

Add runserver.py script to just run the server from the command line,
outside of the testing environment.  Add necessary hooks within
nilmdb/server.py to allow this to happen.

Metadata operations get stream_id first and report error on missing
stream, instead of returning an empty dict.


git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10443 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-02-20 05:52:33 +00:00
Jim Paris
9b64a18daf Remove nilmdbsql; move functions into nilmdb.py instead 
TODO                |    2 
 nilmdb/__init__.py  |    1 
 nilmdb/nilmdb.py    |  113 +++++++++++++++++++++++++++++++++++++++++-----
 nilmdb/nilmdbsql.py |  126 ----------------------------------------------------
 4 files changed, 102 insertions(+), 140 deletions(-)



git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10428 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-02-17 20:42:08 +00:00
Jim Paris
398d382dac Stuff goes into the SQL database now. 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10427 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-02-17 00:32:36 +00:00
Jim Paris
53e3c44186 Move schema updates to a dict 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10421 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-02-15 23:11:37 +00:00
Jim Paris
4395f68662 Start SQL stuff 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10419 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-02-14 21:54:30 +00:00
Jim Paris
c5ec07a661 Start working towards mixed sql/pytables db 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10373 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-02-08 19:28:16 +00:00
Jim Paris
4ca726439b Branch 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10372 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-02-08 18:11:31 +00:00
Jim Paris
72deddcd9b tags 
git-svn-id: https://bucket.mit.edu/svn/nilm/tags/nilmdb-pytables@10371 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-02-08 18:07:32 +00:00
Jim Paris
bc1d0260eb ignore 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10368 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-02-08 18:01:21 +00:00
Jim Paris
ef2db81d11 Misc 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10367 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-02-08 18:01:05 +00:00
Jim Paris
6812a28131 Make stream_list return number of rows. 
Update layouts to include expected number of rows per day -- this is
used (as strongly suggested by the PyTables docs) to form a rough
estimate of the number of rows in a table during CreateTable.


git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb-new@10340 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-30 20:25:11 +00:00
Jim Paris
7933775462 TODO 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb-new@10339 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-30 18:09:05 +00:00
Jim Paris
3b9d84d689 Adjust how layouts are managed: now we pass strings representing the 
layouts, rather than direct dict objects.  This allows us to go
backwards and match the description of tables in the database with the
layouts defined within nilmdb.layout.

Fix some big issues with the nilmdb.server and startup errors like an
invalid port number.  We have to catch os._exit and report the error
ourselves.

Add some timeouts and otherwise clean up tests.

Make NilmDB track and complain about files that weren't closed before
the object is destroyed.

Update stream_list and /stream/list to return the layout corresponding
to each table.



git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb-new@10338 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-28 00:36:23 +00:00
Jim Paris
b5e3b22558 Fixups, and add serializer to NilmDB access from CherryPy 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb-new@10336 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-27 19:17:09 +00:00
Jim Paris
93d7088af3 update TODO 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb-new@10335 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-27 01:28:45 +00:00
Jim Paris
9f4d88cc8f Added serialization wrapper. This will let us wrap the NilmDB object 
and ensure that all function calls happen from within the context of a
single thread.


git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb-new@10334 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-27 01:27:21 +00:00
Jim Paris
8da7de817c Update TODO 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb-new@10332 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-26 00:14:16 +00:00
Jim Paris
acdea5f00b Integrated CherryPy server into tree 
Added testing framework for cherrypy server.
Added tests for basic server functionality.


git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb-new@10331 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-26 00:13:44 +00:00
Jim Paris
6c9cf198d7 indexing 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb-new@10330 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-23 21:07:59 +00:00
Jim Paris
5fa3ff9610 TODO, and ignore stuff 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb-new@10329 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-23 20:38:37 +00:00
Jim Paris
35a801d997 Don't include the test database 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb-new@10328 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-23 20:38:01 +00:00
Jim Paris
a3634c468f Misc 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb-new@10327 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-23 00:59:17 +00:00
Jim Paris
dfaeddefa2 Mics 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb-new@10326 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-23 00:40:48 +00:00
Jim Paris
e1d827e246 new 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10325 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-21 23:46:13 +00:00
Jim Paris
3e703ea9ed nilmdb server, connector 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10324 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-21 22:39:51 +00:00
Jim Paris
211b652f8c misc 
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10323 ddd99763-3ecb-0310-9145-efcb8ce7c51f
 2012-01-20 22:41:32 +00:00