fix(url): adding in url resolving

bassrock · bassrock · commit 00f98ef109b8 · 2024-10-08T19:09:51.000-07:00
diff --git a/.run/tests.run.xml b/.run/tests.run.xml
@@ -1,11 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="tests" type="tests" factoryName="py.test">
     <module name="recommendation-api" />
+    <option name="ENV_FILES" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <option name="SDK_HOME" value="" />
+    <option name="SDK_NAME" value="Remote Python 3.11.2 Docker Compose (app)" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
+    <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
diff --git a/app/graphql/item.py b/app/graphql/item.py
@@ -1,32 +1,34 @@
-from typing import List, Optional
+from typing import List, Optional, NewType
 
 import strawberry
 from strawberry.federation.schema_directives import Key, Requires
 
 from app.graphql.corpus_recommendation import CorpusRecommendation
 from app.graphql.directives import CacheControl
+from app.graphql.link import Url
 from app.graphql.resolvers.item2item_resolvers import resolve_similar_to_saved, resolve_after_article
 from app.models.item import ItemModel
 
 
 @strawberry.experimental.pydantic.type(
     model=ItemModel,
-    directives=[Key(fields="itemId")])
+    directives=[Key(fields="itemId"), Key(fields="givenUrl")])
 class Item:
     item_id: str  # This type is a 'str' and not an 'ID' in our graph.
+    given_url: Url  # This type is a 'str' and not an 'ID' in our graph.
 
     # a field from a different subgraph
     # see https://www.apollographql.com/docs/federation/entities-advanced/#contributing-computed-entity-fields
     language: Optional[str] = strawberry.federation.field(external=True)
 
     relatedAfterArticle: List[CorpusRecommendation] = strawberry.field(
         directives=[CacheControl(maxAge=3600),
-                    Requires(fields='language')],
+                    Requires(fields='language itemId')],
         resolver=resolve_after_article,
         description='Recommend similar articles to show in the bottom of an article.')
 
     relatedAfterCreate: List[CorpusRecommendation] = strawberry.field(
         directives=[CacheControl(maxAge=3600),
-                    Requires(fields='language')],
+                    Requires(fields='language itemId')],
         resolver=resolve_similar_to_saved,
         description='Recommend similar articles after saving.')
diff --git a/app/graphql/recommendation.py b/app/graphql/recommendation.py
@@ -20,6 +20,6 @@ class Recommendation:
     feed_item_id: Optional[strawberry.ID] = strawberry.field(deprecation_reason="Use `id`")
     feed_id: auto
     item_id: strawberry.ID
-    item: Item = strawberry.federation.field(shareable=True)
+    item: Item = strawberry.federation
     rec_src: str
     publisher: auto
diff --git a/app/models/candidate.py b/app/models/candidate.py
@@ -5,3 +5,4 @@ class Candidate(BaseModel):
     item_id: int
     publisher: str
     feed_id: Optional[int]
+    url: str
diff --git a/app/models/item.py b/app/models/item.py
@@ -3,3 +3,4 @@
 
 class ItemModel(BaseModel):
     item_id: str
+    given_url: str
diff --git a/app/models/recommendation.py b/app/models/recommendation.py
@@ -52,7 +52,7 @@ def candidate_dict_to_recommendation(candidate: dict):
             feed_id=candidate.get('feed_id'),
             publisher=candidate.get('publisher'),
             item_id=candidate.get('item_id'),
-            item=ItemModel(item_id=candidate.get('item_id'))
+            item=ItemModel(item_id=candidate.get('item_id'), url=candidate.get('url')),
         )
         recommendation.feed_item_id = recommendation.id
         return recommendation
diff --git a/tests/functional/models/test_candidate_set_model.py b/tests/functional/models/test_candidate_set_model.py
@@ -14,7 +14,8 @@ async def test_verify_candidate_set(candidate_sets_dynamodb_table, aiocache_fixt
             {
                 "feed_id": 1,
                 "item_id": 3208490410,
-                "publisher": "hbr.org"
+                "publisher": "hbr.org",
+                "url": "https://hbr.org"
             }
         ]
     })
@@ -32,7 +33,8 @@ async def test_get_candidate_set(candidate_sets_dynamodb_table, aiocache_fixture
             {
                 "feed_id": 1,
                 "item_id": 3208490410,
-                "publisher": "hbr.org"
+                "publisher": "hbr.org",
+                "url": "https://hbr.org"
             }
         ]
     })
@@ -54,7 +56,8 @@ async def test_get_cached_candidate_set(candidate_sets_dynamodb_table, aiocache_
             {
                 "feed_id": 1,
                 "item_id": 3208490410,
-                "publisher": "hbr.org"
+                "publisher": "hbr.org",
+                "url": "https://hbr.org"
             }
         ]
     })
diff --git a/tests/functional/models/test_slate_lineup_model.py b/tests/functional/models/test_slate_lineup_model.py
@@ -18,7 +18,8 @@
         {
             "feed_id": 1,
             "item_id": 3208490410,
-            "publisher": "hbr.org"
+            "publisher": "hbr.org",
+            "url": "https://hbr.org"
         }
     ]
 }
@@ -31,12 +32,14 @@
         {
             "feed_id": 1,
             "item_id": 11,
-            "publisher": "getpocket.com"
+            "publisher": "getpocket.com",
+            "url": "https://getpocket.com"
         },
         {
             "feed_id": 1,
             "item_id": 12,
-            "publisher": "getpocket.com"
+            "publisher": "getpocket.com",
+            "url": "https://getpocket.com/item/test"
         }
     ]
 }
@@ -119,17 +122,20 @@ async def test_get_slate_lineup_limited_recs(self, slate_config, slate_lineup_co
                 {
                     "feed_id": 1,
                     "item_id": 3208490410,
-                    "publisher": "hbr.org"
+                    "publisher": "hbr.org",
+                    "url": "https://hbr.org"
                 },
                 {
                     "feed_id": 1,
                     "item_id": 3208650410,
-                    "publisher": "hbr.org"
+                    "publisher": "hbr.org",
+                    "url": "https://hbr.org/2"
                 },
                 {
                     "feed_id": 1,
                     "item_id": 32084925410,
-                    "publisher": "hbr.org"
+                    "publisher": "hbr.org",
+                    "url": "https://hbr.org/4"
                 }
             ]
         })
@@ -156,12 +162,14 @@ async def test_get_slate_lineup_dedupe_recs(self, slate_lineup_config):
                 {
                     "feed_id": 1,
                     "item_id": 10,
-                    "publisher": "hbr.org"
+                    "publisher": "hbr.org",
+                    "url": "https://hbr.org/3"
                 },
                 {
                     "feed_id": 1,
                     "item_id": 11,
-                    "publisher": "hbr.org"
+                    "publisher": "hbr.org",
+                    "url": "https://hbr.org/123"
                 },
             ]
         })
diff --git a/tests/functional/models/test_slate_model.py b/tests/functional/models/test_slate_model.py
@@ -10,22 +10,26 @@
     {
         'feed_id': 1,
         'item_id': 3208490410,
-        'publisher': 'hbr.org'
+        'publisher': 'hbr.org',
+        "url": "https://hbr.org/12"
     },
     {
         'feed_id': 1,
         'item_id': 32087704190,
-        'publisher': 'hbr.org'
+        'publisher': 'hbr.org',
+        "url": "https://hbr.org/16"
     },
     {
         'feed_id': 12,
         'item_id': 32087904100,
-        'publisher': 'hbr.org'
+        'publisher': 'hbr.org',
+        "url": "https://hbr.org/18"
     },
     {
         'feed_id': 2,
         'item_id': 32087904870,
-        'publisher': 'hbr.org'
+        'publisher': 'hbr.org',
+        "url": "https://hbr.org/17"
     }
 ]
 
diff --git a/tests/unit/utils.py b/tests/unit/utils.py
@@ -12,10 +12,10 @@ def generate_recommendations(item_ids: List[int or str]) -> List[RecommendationM
     for item_id in item_ids:
         rec = RecommendationModel(
             item_id=item_id,
-            item=ItemModel(item_id=item_id),
+            item=ItemModel(item_id=item_id, url="https://getpocket.com"),
             rec_src='bowling',
             feed_id=random.randint(0, 101),
-            id=random.randint(0, 101)
+            id=random.randint(0, 101),
         )
         rec.feed_item_id = id
         recs.append(rec)

Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,4 @@`
`3`	`3`
`4`	`4`	`class ItemModel(BaseModel):`
`5`	`5`	`item_id: str`
	`6`	`+ given_url: str`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ def candidate_dict_to_recommendation(candidate: dict):`
`52`	`52`	`feed_id=candidate.get('feed_id'),`
`53`	`53`	`publisher=candidate.get('publisher'),`
`54`	`54`	`item_id=candidate.get('item_id'),`
`55`		`- item=ItemModel(item_id=candidate.get('item_id'))`
	`55`	`+ item=ItemModel(item_id=candidate.get('item_id'), url=candidate.get('url')),`
`56`	`56`	`)`
`57`	`57`	`recommendation.feed_item_id = recommendation.id`
`58`	`58`	`return recommendation`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ async def test_verify_candidate_set(candidate_sets_dynamodb_table, aiocache_fixt`
`14`	`14`	`{`
`15`	`15`	`"feed_id": 1,`
`16`	`16`	`"item_id": 3208490410,`
`17`		`- "publisher": "hbr.org"`
	`17`	`+ "publisher": "hbr.org",`
	`18`	`+ "url": "https://hbr.org"`
`18`	`19`	`}`
`19`	`20`	`]`
`20`	`21`	`})`
`@@ -32,7 +33,8 @@ async def test_get_candidate_set(candidate_sets_dynamodb_table, aiocache_fixture`
`32`	`33`	`{`
`33`	`34`	`"feed_id": 1,`
`34`	`35`	`"item_id": 3208490410,`
`35`		`- "publisher": "hbr.org"`
	`36`	`+ "publisher": "hbr.org",`
	`37`	`+ "url": "https://hbr.org"`
`36`	`38`	`}`
`37`	`39`	`]`
`38`	`40`	`})`
`@@ -54,7 +56,8 @@ async def test_get_cached_candidate_set(candidate_sets_dynamodb_table, aiocache_`
`54`	`56`	`{`
`55`	`57`	`"feed_id": 1,`
`56`	`58`	`"item_id": 3208490410,`
`57`		`- "publisher": "hbr.org"`
	`59`	`+ "publisher": "hbr.org",`
	`60`	`+ "url": "https://hbr.org"`
`58`	`61`	`}`
`59`	`62`	`]`
`60`	`63`	`})`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@`
`18`	`18`	`{`
`19`	`19`	`"feed_id": 1,`
`20`	`20`	`"item_id": 3208490410,`
`21`		`- "publisher": "hbr.org"`
	`21`	`+ "publisher": "hbr.org",`
	`22`	`+ "url": "https://hbr.org"`
`22`	`23`	`}`
`23`	`24`	`]`
`24`	`25`	`}`
`@@ -31,12 +32,14 @@`
`31`	`32`	`{`
`32`	`33`	`"feed_id": 1,`
`33`	`34`	`"item_id": 11,`
`34`		`- "publisher": "getpocket.com"`
	`35`	`+ "publisher": "getpocket.com",`
	`36`	`+ "url": "https://getpocket.com"`
`35`	`37`	`},`
`36`	`38`	`{`
`37`	`39`	`"feed_id": 1,`
`38`	`40`	`"item_id": 12,`
`39`		`- "publisher": "getpocket.com"`
	`41`	`+ "publisher": "getpocket.com",`
	`42`	`+ "url": "https://getpocket.com/item/test"`
`40`	`43`	`}`
`41`	`44`	`]`
`42`	`45`	`}`
`@@ -119,17 +122,20 @@ async def test_get_slate_lineup_limited_recs(self, slate_config, slate_lineup_co`
`119`	`122`	`{`
`120`	`123`	`"feed_id": 1,`
`121`	`124`	`"item_id": 3208490410,`
`122`		`- "publisher": "hbr.org"`
	`125`	`+ "publisher": "hbr.org",`
	`126`	`+ "url": "https://hbr.org"`
`123`	`127`	`},`
`124`	`128`	`{`
`125`	`129`	`"feed_id": 1,`
`126`	`130`	`"item_id": 3208650410,`
`127`		`- "publisher": "hbr.org"`
	`131`	`+ "publisher": "hbr.org",`
	`132`	`+ "url": "https://hbr.org/2"`
`128`	`133`	`},`
`129`	`134`	`{`
`130`	`135`	`"feed_id": 1,`
`131`	`136`	`"item_id": 32084925410,`
`132`		`- "publisher": "hbr.org"`
	`137`	`+ "publisher": "hbr.org",`
	`138`	`+ "url": "https://hbr.org/4"`
`133`	`139`	`}`
`134`	`140`	`]`
`135`	`141`	`})`
`@@ -156,12 +162,14 @@ async def test_get_slate_lineup_dedupe_recs(self, slate_lineup_config):`
`156`	`162`	`{`
`157`	`163`	`"feed_id": 1,`
`158`	`164`	`"item_id": 10,`
`159`		`- "publisher": "hbr.org"`
	`165`	`+ "publisher": "hbr.org",`
	`166`	`+ "url": "https://hbr.org/3"`
`160`	`167`	`},`
`161`	`168`	`{`
`162`	`169`	`"feed_id": 1,`
`163`	`170`	`"item_id": 11,`
`164`		`- "publisher": "hbr.org"`
	`171`	`+ "publisher": "hbr.org",`
	`172`	`+ "url": "https://hbr.org/123"`
`165`	`173`	`},`
`166`	`174`	`]`
`167`	`175`	`})`
Original file line number	Diff line number	Diff line change
`@@ -10,22 +10,26 @@`
`10`	`10`	`{`
`11`	`11`	`'feed_id': 1,`
`12`	`12`	`'item_id': 3208490410,`
`13`		`- 'publisher': 'hbr.org'`
	`13`	`+ 'publisher': 'hbr.org',`
	`14`	`+ "url": "https://hbr.org/12"`
`14`	`15`	`},`
`15`	`16`	`{`
`16`	`17`	`'feed_id': 1,`
`17`	`18`	`'item_id': 32087704190,`
`18`		`- 'publisher': 'hbr.org'`
	`19`	`+ 'publisher': 'hbr.org',`
	`20`	`+ "url": "https://hbr.org/16"`
`19`	`21`	`},`
`20`	`22`	`{`
`21`	`23`	`'feed_id': 12,`
`22`	`24`	`'item_id': 32087904100,`
`23`		`- 'publisher': 'hbr.org'`
	`25`	`+ 'publisher': 'hbr.org',`
	`26`	`+ "url": "https://hbr.org/18"`
`24`	`27`	`},`
`25`	`28`	`{`
`26`	`29`	`'feed_id': 2,`
`27`	`30`	`'item_id': 32087904870,`
`28`		`- 'publisher': 'hbr.org'`
	`31`	`+ 'publisher': 'hbr.org',`
	`32`	`+ "url": "https://hbr.org/17"`
`29`	`33`	`}`
`30`	`34`	`]`
`31`	`35`