This commit is contained in:
parent
00b87b040e
commit
c554194fb5
7 changed files with 10 additions and 18 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -70,3 +70,4 @@ pip-selfcheck.json
|
|||
# custom
|
||||
tags
|
||||
.env
|
||||
.mypy_cache
|
||||
|
|
|
@ -3,12 +3,10 @@ from flask_smorest import Api
|
|||
from flask_marshmallow import Marshmallow
|
||||
from flask_sqlalchemy import SQLAlchemy
|
||||
from flask_migrate import Migrate
|
||||
#from flask_jwt_extended import JWTManager
|
||||
|
||||
|
||||
db = SQLAlchemy()
|
||||
ma = Marshmallow()
|
||||
#jwt = JWTManager()
|
||||
|
||||
|
||||
def create_app(cfg='default'):
|
||||
|
@ -26,9 +24,7 @@ def create_app(cfg='default'):
|
|||
api.init_app(app)
|
||||
db.init_app(app)
|
||||
ma.init_app(app)
|
||||
#jwt.init_app(app)
|
||||
Migrate(app, db)
|
||||
resources.register_blueprints(api)
|
||||
|
||||
return app
|
||||
|
||||
|
|
|
@ -11,4 +11,3 @@ def register_blueprints(api):
|
|||
|
||||
api.register_blueprint(resource_blp,
|
||||
url_prefix=f'/{resource_blp.url_prefix}')
|
||||
|
||||
|
|
|
@ -32,4 +32,3 @@ class ImpulseById(MethodView):
|
|||
impulse = Impulse.query.filter_by(id=impulse_id).first()
|
||||
db.session.delete(impulse)
|
||||
db.session.commit()
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
from marshmallow import SchemaOpts
|
||||
from marshmallow import pre_load, post_dump
|
||||
from marshmallow_sqlalchemy import ModelSchemaOpts, ModelConverter, ModelSchema
|
||||
from .. import ma
|
||||
from .. import db
|
||||
|
||||
|
||||
|
@ -23,7 +22,6 @@ class NamespaceOpts(ModelSchemaOpts):
|
|||
self.include_relationships = True
|
||||
|
||||
|
||||
#class NamespacedSchema(ma.SQLAlchemySchema):
|
||||
class NamespacedSchema(ModelSchema):
|
||||
OPTIONS_CLASS = NamespaceOpts
|
||||
|
||||
|
@ -42,4 +40,3 @@ class NamespacedSchema(ModelSchema):
|
|||
else:
|
||||
key = self.opts.plural_name if many else self.opts.name
|
||||
return {key: data}
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
"""empty message
|
||||
|
||||
Revision ID: 925f94e2acd6
|
||||
Revises:
|
||||
Revises:
|
||||
Create Date: 2021-01-23 21:09:25.068512
|
||||
|
||||
"""
|
||||
|
@ -19,11 +19,11 @@ depends_on = None
|
|||
def upgrade():
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.create_table('impulse',
|
||||
sa.Column('id', sa.Integer(), nullable=False),
|
||||
sa.Column('power', sa.Integer(), nullable=False),
|
||||
sa.Column('created_at', sa.DateTime(), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
sa.Column('id', sa.Integer(), nullable=False),
|
||||
sa.Column('power', sa.Integer(), nullable=False),
|
||||
sa.Column('created_at', sa.DateTime(), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id')
|
||||
)
|
||||
# ### end Alembic commands ###
|
||||
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@ import time
|
|||
import datetime
|
||||
import requests
|
||||
|
||||
import influxdb_client, os
|
||||
from influxdb_client import InfluxDBClient, Point, WritePrecision
|
||||
import influxdb_client
|
||||
import os
|
||||
from influxdb_client.client.write_api import SYNCHRONOUS
|
||||
|
||||
|
||||
|
@ -42,7 +42,7 @@ def flaskapp():
|
|||
|
||||
def influxdb():
|
||||
point = (
|
||||
Point("electricity")
|
||||
influxdb_client.Point("electricity")
|
||||
.field("consumption", 2)
|
||||
)
|
||||
write_api.write(bucket=bucket, org="finn", record=point)
|
||||
|
|
Loading…
Reference in a new issue