Skip to content

Commit 9fa1437

Browse files
committedAug 5, 2021
Passed args from render() to _render_alt_profile_html(), included templates folder in setup.py
1 parent cafd0af commit 9fa1437

File tree

3 files changed

+49
-17
lines changed

3 files changed

+49
-17
lines changed
 

‎pyldapi/renderer.py

+26-8
Original file line numberDiff line numberDiff line change
@@ -443,10 +443,10 @@ def _make_rdf_response(self, graph, mimetype=None, headers=None, delete_graph=Tr
443443
)
444444

445445
def _render_alt_profile_html(
446-
self,
447-
alt_template: str = "alt.html",
448-
additional_alt_template_context=None,
449-
alt_template_context_replace=False
446+
self,
447+
alt_template: str = "alt.html",
448+
additional_alt_template_context=None,
449+
alt_template_context_replace=False
450450
):
451451
"""Renders the Alternates Profile in HTML
452452
@@ -509,7 +509,12 @@ def _render_alt_profile_json(self):
509509
headers=self.headers
510510
)
511511

512-
def _render_alt_profile(self):
512+
def _render_alt_profile(
513+
self,
514+
alt_template: str = "alt.html",
515+
additional_alt_template_context=None,
516+
alt_template_context_replace=False
517+
):
513518
"""
514519
Return a Flask Response object depending on the value assigned to :code:`self.mediatype`.
515520
@@ -519,13 +524,22 @@ def _render_alt_profile(self):
519524
if self.mediatype == '_internal':
520525
return self
521526
if self.mediatype == 'text/html':
522-
return self._render_alt_profile_html()
527+
return self._render_alt_profile_html(
528+
alt_template,
529+
additional_alt_template_context,
530+
alt_template_context_replace
531+
)
523532
elif self.mediatype in RDF_MEDIATYPES:
524533
return self._render_alt_profile_rdf()
525534
else: # application/json
526535
return self._render_alt_profile_json()
527536

528-
def render(self):
537+
def render(
538+
self,
539+
alt_template: str = "alt.html",
540+
additional_alt_template_context=None,
541+
alt_template_context_replace=False
542+
):
529543
"""
530544
Use the received profile and mediatype to create a response back to the client.
531545
@@ -542,7 +556,11 @@ def render(self):
542556
if self.vf_error is not None:
543557
return Response(self.vf_error, status=400, media_type='text/plain')
544558
elif self.profile == 'alt' or self.profile == 'alternates':
545-
return self._render_alt_profile()
559+
return self._render_alt_profile(
560+
alt_template,
561+
additional_alt_template_context,
562+
alt_template_context_replace
563+
)
546564
return None
547565

548566
# end making response content

‎pyldapi/renderer_container.py

+16-7
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def __init__(self,
6464
:param super_register: A super-Register URI for this register. Can be within this API or external.
6565
:type super_register: str
6666
:param members_template: The Jinja2 template to use for rendering the HTML profile of the register. If None,
67-
then it will default to try and use a template called :code:`alt.html`.
67+
then it will default to try and use a template called :code:`mem.html`.
6868
:type members_template: str or None
6969
:param per_page: Number of items to show per page if not specified in request. If None, then it will default to
7070
RegisterRenderer.DEFAULT_ITEMS_PER_PAGE.
@@ -195,7 +195,12 @@ def _paging(self):
195195

196196
return None
197197

198-
def render(self):
198+
def render(
199+
self,
200+
mem_template: str = "mem.html",
201+
additional_mem_template_context=None,
202+
mem_template_context_replace=False
203+
):
199204
"""
200205
Renders the register profile.
201206
@@ -206,7 +211,11 @@ def render(self):
206211
if response is None and self.profile == 'mem':
207212
if self.paging_error is None:
208213
if self.mediatype == 'text/html':
209-
return self._render_mem_profile_html()
214+
return self._render_mem_profile_html(
215+
mem_template,
216+
additional_mem_template_context,
217+
mem_template_context_replace
218+
)
210219
elif self.mediatype in Renderer.RDF_MEDIA_TYPES:
211220
return self._render_mem_profile_rdf()
212221
else:
@@ -216,10 +225,10 @@ def render(self):
216225
return response
217226

218227
def _render_mem_profile_html(
219-
self,
220-
mem_template: str = "mem.html",
221-
additional_mem_template_context=None,
222-
mem_template_context_replace=False
228+
self,
229+
mem_template: str = "mem.html",
230+
additional_mem_template_context=None,
231+
mem_template_context_replace=False
223232
):
224233
_template_context = {
225234
'uri': self.instance_uri,

‎setup.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import codecs
44
import re
55
import os
6-
from setuptools import setup
6+
from setuptools import setup, find_packages
77

88

99
def open_local(paths, mode='r', encoding='utf8'):
@@ -29,7 +29,12 @@ def open_local(paths, mode='r', encoding='utf8'):
2929

3030
setup(
3131
name='pyldapi',
32-
packages=['pyldapi'],
32+
packages=find_packages(),
33+
package_dir={"pyldapi": "pyldapi"},
34+
package_data={
35+
"pyldapi": ["templates/*"],
36+
},
37+
include_package_data=True,
3338
version=version,
3439
description='A very small module to add Linked Data API functionality to '
3540
'a Python FastAPI or Flask (v3.x) installation',

0 commit comments

Comments
 (0)
Please sign in to comment.