Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pls adapt the NINJS outputformatter to provide better references for all renditions [SDCP-723] #2489

Merged
merged 10 commits into from
Nov 16, 2023
Merged

pls adapt the NINJS outputformatter to provide better references for all renditions [SDCP-723] #2489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
08bbe37
udpate renditions settings in NINJS formatter and parser
devketanpro Nov 10, 2023
c6c1a32
fix black
devketanpro Nov 10, 2023
3eb029f
add new renditions config
devketanpro Nov 16, 2023
d0640cd
format and populate data based on new config
devketanpro Nov 16, 2023
2c73492
reformat code via black
devketanpro Nov 16, 2023
fbdf947
refactore rendition parsing
devketanpro Nov 16, 2023
e79edcf
fix pytest
devketanpro Nov 16, 2023
8a50458
change type
devketanpro Nov 16, 2023
3929271
minor change and update tests
devketanpro Nov 16, 2023
fa2d248
fix tests and addressed comment
devketanpro Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 94 additions & 52 deletions features/ingest.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,18 +477,29 @@ Feature: Fetch From Ingest
"type":"picture",
"state":"ingested",
"renditions":{
"baseImage":{
"width":1400
},
"thumbnail":{

},
"original":{

"original": {
"poi": {
"y": 1193,
"x": 2128
},
"href": "http://content.reuters.com/auth-server/content/tag_reuters.com_2014_newsml_LYNXMPEA6F0MT_2/tag_reuters.com_2014_binary_LYNXMPEA6F0MT-BASEIMAGE?auth_token=fake_token",
"mimetype": "image/jpeg",
"media": "599e31ec1d41c833e0b8a830",
"width": 3489,
"height": 2296
},
"viewImage":{
"baseImage": {
"poi": {
"y": 478,
"x": 854
},
"href": "http://content.reuters.com/auth-server/content/tag_reuters.com_2014_newsml_LYNXMPEA6F0MT_2/tag_reuters.com_2014_binary_LYNXMPEA6F0MT-BASEIMAGE?auth_token=fake_token",
"mimetype": "image/jpeg",
"media": "599e31ed1d41c833e0b8a840",
"width": 1400,
"height": 921
}
}
}
},
{
"type":"text",
Expand All @@ -497,11 +508,28 @@ Feature: Fetch From Ingest
"featuremedia":{
"state": "ingested",
"renditions":{
"baseImage":{
"width":1400
},
"original":{
}
"original": {
"poi": {
"y": 1193,
"x": 2128
},
"href": "http://content.reuters.com/auth-server/content/tag_reuters.com_2014_newsml_LYNXMPEA6F0MT_2/tag_reuters.com_2014_binary_LYNXMPEA6F0MT-BASEIMAGE?auth_token=fake_token",
"mimetype": "image/jpeg",
"media": "599e31ec1d41c833e0b8a830",
"width": 3489,
"height": 2296
},
"baseImage": {
"poi": {
"y": 478,
"x": 854
},
"href": "http://content.reuters.com/auth-server/content/tag_reuters.com_2014_newsml_LYNXMPEA6F0MT_2/tag_reuters.com_2014_binary_LYNXMPEA6F0MT-BASEIMAGE?auth_token=fake_token",
"mimetype": "image/jpeg",
"media": "599e31ed1d41c833e0b8a840",
"width": 1400,
"height": 921
}
}
}
}
Expand All @@ -514,7 +542,7 @@ Feature: Fetch From Ingest
@provider
Scenario: Ingest ninjs with embedded items
Given empty "ingest"
When we fetch from "ninjs" ingest "ninjs4.json" (mocking with "ninjs4_mock.json")
When we fetch from "ninjs" ingest "ninjs4.json"
And we get "/ingest"
Then we get existing resource
"""
Expand All @@ -524,19 +552,22 @@ Feature: Fetch From Ingest
"type":"picture",
"state":"ingested",
"headline": "Polizeihunde sollen effizienter trainiert werden – Klone sollen die Lösung sein.",
"renditions":{
"baseImage":{
"width":1400
"renditions": {
"original": {
"media": "Polizeihund-China-2.jpg",
"href": "https://img.futurezone.de/img/science/origs216742511/239706555-w1280-h960-q85/Polizeihund-China-2.jpg",
"mimetype": "image\/jpeg",
"height": 853,
"width": 1280
},
"thumbnail":{

},
"original":{

},
"viewImage":{
"baseImage": {
"media": "Polizeihund-China-2.jpg",
"href": "https://img.futurezone.de/img/science/origs216742511/239706555-w1280-h960-q85/Polizeihund-China-2.jpg",
"mimetype": "image\/jpeg",
"height": 853,
"width": 1280
}
}
}
},
{
"type":"picture",
Expand All @@ -549,13 +580,22 @@ Feature: Fetch From Ingest
"associations":{
"featuremedia":{
"state": "ingested",
"renditions":{
"baseImage":{
"width":1400
},
"original":{
}
}
"renditions": {
"original": {
"media": "Polizeihund-China-2.jpg",
"href": "https://img.futurezone.de/img/science/origs216742511/239706555-w1280-h960-q85/Polizeihund-China-2.jpg",
"mimetype": "image\/jpeg",
"height": 853,
"width": 1280
},
"baseImage": {
"media": "Polizeihund-China-2.jpg",
"href": "https://img.futurezone.de/img/science/origs216742511/239706555-w1280-h960-q85/Polizeihund-China-2.jpg",
"mimetype": "image\/jpeg",
"height": 853,
"width": 1280
}
}
}
}
}
Expand Down Expand Up @@ -591,25 +631,27 @@ Feature: Fetch From Ingest
"headline":"German Air Force Museum",
"state":"ingested",
"renditions":{
"baseImage" : {
"width" : 1400,
"height" : 1074,
"mimetype" : "image/jpeg"
},
"thumbnail" : {
"width":156,
"height":120,
"mimetype" : "image/jpeg"
},
"original" : {
"width" : 800,
"height" : 614,
"mimetype" : "image/jpeg"
"baseImage": {
"poi": {
"y": 382,
"x": 784
},
"media": "599faa351d41c8fdc696d904",
"width": 1400,
"height": 934,
"mimetype": "image/jpeg",
"href": "http://localhost:5000/api/upload-raw/599faa351d41c8fdc696d904?_schema=http"
},
"viewImage":{
"width" : 640,
"height" : 491,
"mimetype" : "image/jpeg"
"original": {
"poi": {
"y": 1646,
"x": 3368
},
"media": "599faa331d41c8fdc696d8b4",
"width": 6016,
"height": 4016,
"mimetype": "image/jpeg",
"href": "http://content.reuters.com/auth-server/content/tag_reuters.com_2014_newsml_LYNXMPEA6F0MT_2/tag_reuters.com_2014_binary_LYNXMPEA6F0MT-BASEIMAGE?auth_token=fake_token"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions superdesk/default_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,7 @@ def local_to_utc_hour(hour):
},
}

NINJS_COMMON_RENDITIONS = list(RENDITIONS["picture"].keys())

#: BCRYPT work factor
BCRYPT_GENSALT_WORK_FACTOR = 12
Expand Down
40 changes: 38 additions & 2 deletions superdesk/io/feed_parsers/ninjs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ def _transform_from_ninjs(self, ninjs):
associated_item["versioncreated"] = self.datetime(associated_item["versioncreated"])
item["associations"][key] = deepcopy(associated_item)

if ninjs.get("renditions", {}).get("baseImage"):
item["renditions"] = {"baseImage": {"href": ninjs.get("renditions", {}).get("original", {}).get("href")}}
if ninjs.get("renditions"):
item["renditions"] = self.parse_renditions(ninjs["renditions"])

if ninjs.get("located"):
item["dateline"] = {"located": {"city": ninjs.get("located")}}
Expand All @@ -146,6 +146,42 @@ def _transform_from_ninjs(self, ninjs):

return item

def parse_renditions(self, renditions):
rend = {}
for rendition_name, rendition_data in renditions.items():
parsed_rendition = {}

# Parse href
href = rendition_data.get("href", "")
if isinstance(href, str) and href:
parsed_rendition["href"] = href

# Parse width and height
width = rendition_data.get("width", None)
height = rendition_data.get("height", None)
if isinstance(width, int) and isinstance(height, int):
parsed_rendition["width"] = width
parsed_rendition["height"] = height

# Parse mimetype
mimetype = rendition_data.get("mimetype", "")
if isinstance(mimetype, str) and mimetype:
parsed_rendition["mimetype"] = mimetype

# Parse poi
poi = rendition_data.get("poi", {})
if isinstance(poi, dict) and "x" in poi and "y" in poi:
parsed_rendition["poi"] = {"x": poi["x"], "y": poi["y"]}

# Parse media
media = rendition_data.get("media", "")
if isinstance(media, str) and media:
parsed_rendition["media"] = media

if parsed_rendition:
rend[rendition_name] = parsed_rendition
return rend

def _format_qcodes(self, items):
subjects = []
for item in items:
Expand Down
2 changes: 1 addition & 1 deletion superdesk/publish/formatters/ninjs_formatter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def __init__(self):
self.format_type = "ninjs"
self.can_preview = True
self.can_export = True
self.internal_renditions = ["original"]
self.internal_renditions = app.config.get("NINJS_COMMON_RENDITIONS", []) + ["original"]

def format(self, article, subscriber, codes=None):
try:
Expand Down
8 changes: 7 additions & 1 deletion tests/publish/formatters/ninjs_formatter_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ def test_picture_formatter(self):
"href": "https://one-api.aap.com.au/api/v3/Assets/20150723001158606583/Original/download",
"mimetype": "image/jpeg",
},
"viewImage": {
"height": 401,
"href": "http://localhost:5000/api/upload/55b032041d41c8d278d21b6f/raw?_schema=http",
"mimetype": "image/jpeg",
"width": 640,
},
},
"headline": "AMAZING PICTURE",
"pubstatus": "usable",
Expand All @@ -203,7 +209,7 @@ def test_picture_formatter(self):
"embargoed": embargoed.isoformat(),
}
self.assertEqual(expected, json.loads(doc))
self.assertNotIn("viewImage", json.loads(doc).get("renditions"))
self.assertIn("viewImage", json.loads(doc).get("renditions"))

def test_composite_formatter(self):
article = {
Expand Down
Loading