mirror
/
federation
kopia lustrzana https://gitlab.com/jaywink/federation
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

removed debug prints. switch request_cache to its default backend (sqlite) for now

jsonld-processing
Alain St-Denis 2022-04-03 13:27:27 +00:00
rodzic 2c88cf9023
commit d12cd6eb66
1 zmienionych plików z 7 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
federation/entities/activitypub/models.py
Wyświetl plik

@ -7,7 +7,6 @@ from marshmallow.fields import Integer
from pyld import jsonld, documentloader from pyld import jsonld, documentloader
import json import json
import requests_cache import requests_cache
from pprint import pprint
from federation.entities.mixins import BaseEntity from federation.entities.mixins import BaseEntity
from federation.entities.base import Image as BaseImage from federation.entities.base import Image as BaseImage
@ -21,7 +20,6 @@ logger = logging.getLogger("federation")
# accept other content types. From what I understand, precedence handling # accept other content types. From what I understand, precedence handling
# is broken # is broken
def myloader(*args, **kwargs): def myloader(*args, **kwargs):
requests_cache.install_cache('ld_cache', backend='redis') # this will require some configuration mechanism
requests_loader = documentloader.requests.requests_document_loader(*args, **kwargs) requests_loader = documentloader.requests.requests_document_loader(*args, **kwargs)
def loader(url, options={}): def loader(url, options={}):
@ -29,6 +27,12 @@ def myloader(*args, **kwargs):
return requests_loader(url, options) return requests_loader(url, options)
return loader return loader
'''
By default, request_cache creates a sqlite cache.
A redis backend is available, Should we fetch the
redis config params from django, if available?
'''
requests_cache.install_cache('ld_cache')
jsonld.set_document_loader(myloader()) jsonld.set_document_loader(myloader())
class AddedSchemaOpts(JsonLDSchemaOpts): class AddedSchemaOpts(JsonLDSchemaOpts):
@ -142,7 +146,6 @@ class MixedField(fields.Nested):
return super()._serialize(value, attr, obj, **kwargs) return super()._serialize(value, attr, obj, **kwargs)
def _deserialize(self, value, attr, data, **kwargs): def _deserialize(self, value, attr, data, **kwargs):
print(value,attr)
if isinstance(value, list): if isinstance(value, list):
# this is just so the ACTIVITYPUB_POST_OBJECT_IMAGES test payload passes # this is just so the ACTIVITYPUB_POST_OBJECT_IMAGES test payload passes
if len(value) > 0 and value[0] == {}: if len(value) > 0 and value[0] == {}:
@ -218,7 +221,6 @@ class Object(metaclass=JsonLDAnnotation):
s = json.dumps(data.get('@context')) s = json.dumps(data.get('@context'))
if 'python-federation"' in s: if 'python-federation"' in s:
data['@context'] = json.loads(s.replace('python-federation', 'python-federation#', 1)) data['@context'] = json.loads(s.replace('python-federation', 'python-federation#', 1))
pprint(data)
return data return data
''' '''
@ -431,6 +433,7 @@ class Note(Object):
target_id = IRI(as2.inReplyTo) target_id = IRI(as2.inReplyTo)
conversation = fields.String(ostatus.conversation) conversation = fields.String(ostatus.conversation)
inReplyToAtomUri = IRI(ostatus.inReplyToAtomUri) inReplyToAtomUri = IRI(ostatus.inReplyToAtomUri)
summary = fields.String(as2.summary)
url = IRI(as2.url) url = IRI(as2.url)
def to_base(self): def to_base(self):
@ -548,7 +551,6 @@ class Announce(Activity):
target_id = IRI(as2.object) target_id = IRI(as2.object)
def to_base(self): def to_base(self):
print(self.__dict__)
if self.activity == self: if self.activity == self:
entity = ActivitypubShare(**self.__dict__) entity = ActivitypubShare(**self.__dict__)
else: else:
@ -622,7 +624,6 @@ class View(Create):
def model_to_objects(payload): def model_to_objects(payload):
model = globals().get(payload.get('type')) model = globals().get(payload.get('type'))
print(model)
if model and issubclass(model, Object): if model and issubclass(model, Object):
try: try:
entity = model.schema().load(payload) entity = model.schema().load(payload)