Skip to content

Commit a0481ea

Browse files
author
Thomas Hanke
committed
removed some printouts
1 parent 5d91024 commit a0481ea

3 files changed

Lines changed: 83 additions & 857 deletions

File tree

app.py

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
config_name = os.environ.get("APP_MODE") or "development"
3131
middleware = [
3232
Middleware(
33-
SessionMiddleware, secret_key=os.environ.get("APP_SECRET", "changemeNOW"),
33+
SessionMiddleware,
34+
secret_key=os.environ.get("APP_SECRET", "changemeNOW"),
3435
),
3536
# Middleware(CSRFProtectMiddleware, csrf_secret=os.environ.get('APP_SECRET','changemeNOW')),
3637
Middleware(
@@ -97,11 +98,12 @@ def get_flashed_messages(request: Request):
9798

9899
templates.env.globals["get_flashed_messages"] = get_flashed_messages
99100

101+
100102
@app.get("/", response_class=HTMLResponse, include_in_schema=False)
101103
async def index(request: Request):
102104
start_form = await forms.StartForm.from_formdata(request)
103105
start_form.method_sel.choices = [(v, k) for k, v in app.methods_dict.items()]
104-
#request.session.clear()
106+
# request.session.clear()
105107
return templates.TemplateResponse(
106108
"index.html",
107109
{
@@ -113,11 +115,14 @@ async def index(request: Request):
113115
},
114116
)
115117

118+
116119
@app.post("/create_mapper", response_class=HTMLResponse, include_in_schema=False)
117120
async def create_mapper(request: Request):
118-
authorization=request.headers.get('Authorization',None)
121+
# print(request.headers)
122+
authorization = request.headers.get("Authorization", None)
123+
# print(f"create mapper authorization: {authorization}")
119124
if authorization:
120-
logging.debug('got authorization header')
125+
logging.debug("got authorization header")
121126
logging.debug(await request.body())
122127

123128
start_form = await forms.StartForm.from_formdata(request)
@@ -168,13 +173,13 @@ async def create_mapper(request: Request):
168173
method_object_super_class_uris=[
169174
URIRef(uri) for uri in mapping_object_class_uris
170175
],
171-
authorization=authorization
176+
authorization=authorization,
172177
)
173178
flash(request, str(mapper), "info")
174-
#flash(request, str(mapper.subjects), "info")
179+
# flash(request, str(mapper.subjects), "info")
175180
except Exception as err:
176181
flash(request, str(err), "error")
177-
#print(mapper.objects.keys())
182+
# print(mapper.objects.keys())
178183
# only named instances in the data can be mapped
179184
else:
180185
info_choices = [
@@ -186,9 +191,9 @@ async def create_mapper(request: Request):
186191
select_forms = forms.get_select_entries(mapper.objects.keys(), info_choices)
187192
mapping_form = await forms.MappingFormList.from_formdata(request)
188193
mapping_form.assignments.entries = select_forms
189-
request.session['auth']=authorization
190-
logging.debug('session: {}'.format(request.session))
191-
194+
request.session["auth"] = authorization
195+
logging.debug("session: {}".format(request.session))
196+
192197
return templates.TemplateResponse(
193198
"index.html",
194199
{
@@ -203,14 +208,15 @@ async def create_mapper(request: Request):
203208

204209
@app.post("/map", response_class=HTMLResponse, include_in_schema=False)
205210
async def map(request: Request):
206-
authorization=request.headers.get('Authorization',None) or request.session.get('auth',None)
211+
authorization = request.headers.get("Authorization", None) or request.session.get(
212+
"auth", None
213+
)
207214
if authorization:
208-
logging.debug('got authorization header')
209-
logging.debug('get map')
210-
logging.debug('session: {}'.format(request.session))
215+
logging.debug("got authorization header")
216+
logging.debug("get map")
217+
logging.debug("session: {}".format(request.session))
211218

212-
213-
#logging.debug(request.data)
219+
# logging.debug(request.data)
214220
formdata = await request.form()
215221
data_url = request.session.get("data_url", None)
216222
method_url = request.session.get("method_url", None)
@@ -235,8 +241,8 @@ async def map(request: Request):
235241
maplist = [(k, v) for k, v in select_dict.items() if v != "None"]
236242
logging.info("Creating mapping file for mapping list: {}".format(maplist))
237243
request.session["maplist"] = maplist
238-
logging.debug('subjects: {}'.format(subjects))
239-
logging.debug('objects: {}'.format(objects))
244+
logging.debug("subjects: {}".format(subjects))
245+
logging.debug("objects: {}".format(objects))
240246
with maptomethod.Mapper(
241247
data_url=data_url,
242248
method_url=method_url,
@@ -251,13 +257,13 @@ async def map(request: Request):
251257
maplist=maplist,
252258
subjects=subjects,
253259
objects=objects,
254-
authorization=authorization
260+
authorization=authorization,
255261
) as mapper:
256262
result = mapper.to_pretty_yaml()
257263
filename = result["filename"]
258264
result_string = result["filedata"]
259-
#print(type(result_string))
260-
#print(result_string)
265+
# print(type(result_string))
266+
# print(result_string)
261267
b64 = base64.b64encode(result_string.encode())
262268
payload = b64.decode()
263269
return templates.TemplateResponse(
@@ -298,10 +304,12 @@ class Config:
298304

299305
@app.post("/api/entities")
300306
def query_entities(request: QueryRequest, req: Request):
301-
authorization=req.headers.get('Authorization',None)
307+
authorization = req.headers.get("Authorization", None)
302308
# translate urls in entity_classes list to URIRef objects
303309
request.entity_classes = [URIRef(str(url)) for url in request.entity_classes]
304-
return maptomethod.query_entities(str(request.url), request.entity_classes, authorization)
310+
return maptomethod.query_entities(
311+
str(request.url), request.entity_classes, authorization
312+
)
305313

306314

307315
class MappingRequest(BaseModel):
@@ -311,8 +319,10 @@ class MappingRequest(BaseModel):
311319
method_url: AnyUrl = Field(
312320
"", title="Method Graph Url", description="Url to knowledge graph to use."
313321
)
314-
use_template_rowwise: Optional[bool] = Field(
315-
False, title="Use Template Rowwise", description="If to duplicate the Method Graph for each row.",
322+
use_template_rowwise: Optional[bool] = Field(
323+
False,
324+
title="Use Template Rowwise",
325+
description="If to duplicate the Method Graph for each row.",
316326
omit_default=True,
317327
)
318328
data_super_classes: List = Field(
@@ -363,10 +373,10 @@ class YAMLResponse(StreamingResponse):
363373

364374
@app.post("/api/mapping", response_class=YAMLResponse)
365375
def mapping(request: MappingRequest, req: Request) -> StreamingResponse:
366-
authorization=req.headers.get('Authorization',None)
376+
authorization = req.headers.get("Authorization", None)
367377
if authorization:
368-
logging.debug('got authorization header')
369-
378+
logging.debug("got authorization header")
379+
370380
try:
371381
result = maptomethod.Mapper(
372382
str(request.data_url),
@@ -375,15 +385,14 @@ def mapping(request: MappingRequest, req: Request) -> StreamingResponse:
375385
URIRef(str(uri)) for uri in request.method_super_classes
376386
],
377387
mapping_predicate_uri=URIRef(str(request.predicate)),
378-
use_template_rowwise = request.use_template_rowwise,
388+
use_template_rowwise=request.use_template_rowwise,
379389
data_subject_super_class_uris=[
380390
URIRef(str(uri)) for uri in request.data_super_classes
381391
],
382392
maplist=request.map.items(),
383-
authorization=authorization
393+
authorization=authorization,
384394
).to_pretty_yaml()
385395
except Exception as err:
386-
print(err)
387396
raise HTTPException(status_code=500, detail=str(err))
388397
data_bytes = BytesIO(result["filedata"].encode())
389398
filename = result["filename"]
@@ -424,6 +433,7 @@ async def info() -> dict:
424433
log_config=config,
425434
)
426435

436+
427437
@app.exception_handler(HTTPException)
428438
async def http_exception_handler(request, exc):
429439
return JSONResponse(content={"message": exc.detail}, status_code=exc.status_code)

0 commit comments

Comments
 (0)