haxala1r/cloud-computing-msc-ai-examples
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed anyjson, refactoring based on pylint recommendations

Browse Source
This commit is contained in:
Sebastian Rieger 2024-03-18 14:38:45 +01:00
parent df64887c19
commit 05d363ca67
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
faafo/faafo/api/service.py
View File

@ -112,7 +112,7 @@ connection = Connection(CONF.transport_url)
def index(page=1): def index(page=1):
hostname = socket.gethostname() hostname = socket.gethostname()
fractals = Fractal.query.filter( fractals = Fractal.query.filter(
(Fractal.checksum != None) & (Fractal.size != None)).paginate( (Fractal.checksum is not None) & (Fractal.size is not None)).paginate(
page=page, per_page=5) page=page, per_page=5)
return flask.render_template('index.html', fractals=fractals, hostname=hostname) return flask.render_template('index.html', fractals=fractals, hostname=hostname)
@ -137,7 +137,7 @@ def get_fractal(fractalid):
def generate_fractal(**kwargs): def generate_fractal(**kwargs):
print("Postprocessor called!" + str(kwargs)) LOG.debug("Postprocessor called!" + str(kwargs))
with producers[connection].acquire(block=True) as producer: with producers[connection].acquire(block=True) as producer:
producer.publish(kwargs['result'], producer.publish(kwargs['result'],
serializer='json', serializer='json',
@ -145,13 +145,14 @@ def generate_fractal(**kwargs):
declare=[queues.task_exchange], declare=[queues.task_exchange],
routing_key='normal') routing_key='normal')
def convert_image_to_binary(**kwargs): def convert_image_to_binary(**kwargs):
print("Preprocessor call: " + str(kwargs)) LOG.debug("Preprocessor call: " + str(kwargs))
if 'image' in kwargs['data']['data']['attributes']: if 'image' in kwargs['data']['data']['attributes']:
print("Converting image to binary...") LOG.debug("Converting image to binary...")
kwargs['data']['data']['attributes']['image'] = str(kwargs['data']['data']['attributes']['image']).encode("ascii") kwargs['data']['data']['attributes']['image'] = \
#print("Preprocessor called!" + str(kwargs)) str(kwargs['data']['data']['attributes']['image']).encode("ascii")
#return kwargs
def main(): def main():
print("Starting API server - new...") print("Starting API server - new...")
@ -163,4 +164,3 @@ def main():
url_prefix='/v1', url_prefix='/v1',
allow_client_generated_ids=True) allow_client_generated_ids=True)
app.run(host=CONF.listen_address, port=CONF.bind_port, debug=True) app.run(host=CONF.listen_address, port=CONF.bind_port, debug=True)

11
faafo/faafo/worker/service.py
View File

@ -19,12 +19,13 @@ import copy
import hashlib import hashlib
import json import json
import os import os
from PIL import Image
import random import random
import socket import socket
import tempfile import tempfile
import time import time
from PIL import Image
from kombu.mixins import ConsumerMixin from kombu.mixins import ConsumerMixin
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log from oslo_log import log
@ -152,11 +153,13 @@ class Worker(ConsumerMixin):
} }
headers = {'Content-Type': 'application/vnd.api+json', headers = {'Content-Type': 'application/vnd.api+json',
'Accept': 'application/vnd.api+json'} 'Accept': 'application/vnd.api+json'}
resp = requests.patch("%s/v1/fractal/%s" % resp = requests.patch("%s/v1/fractal/%s" %
(CONF.endpoint_url, str(task['uuid'])), (CONF.endpoint_url, str(task['uuid'])),
json.dumps(result), headers=headers) json.dumps(result),
headers=headers,
timeout=30)
LOG.debug("Result: %s" % resp.text) LOG.debug("Result: %s" % resp.text)
message.ack() message.ack()

2
faafo/requirements.txt
View File

@ -4,7 +4,7 @@ pytz
positional positional
iso8601 iso8601
#anyjson>=0.3.3 #anyjson>=0.3.3
anyjson #anyjson
#eventlet>=0.17.4 #eventlet>=0.17.4
eventlet eventlet
#PyMySQL>=0.6.2,<0.7 # 0.7 design change breaks faafo, MIT License #PyMySQL>=0.6.2,<0.7 # 0.7 design change breaks faafo, MIT License