Skip to content

replace storage-server with dtable-server #576

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

Open
AlexCXC wants to merge 2 commits into
base: master
Choose a base branch
from
Open

replace storage-server with dtable-server #576

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd8cfbd
replace storage-server with dtable-server
AlexCXC Dec 28, 2023
8fe8ae5
fix put data with content-type
AlexCXC Dec 29, 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
36 changes: 23 additions & 13 deletions dtable_events/utils/dtable_storage_server_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import uuid

import jwt
import requests

try:
from seahub.settings import DTABLE_STORAGE_SERVER_URL
except ImportError as err:
DTABLE_STORAGE_SERVER_URL = ''
from dtable_events.app.config import DTABLE_PRIVATE_KEY
from dtable_events.utils import get_inner_dtable_server_url


TIMEOUT = 90
Expand Down Expand Up @@ -39,15 +39,23 @@ def __init__(self):
"""
:param server_url: str
"""
self.server_url = DTABLE_STORAGE_SERVER_URL.rstrip('/')
self.server_url = get_inner_dtable_server_url().rstrip('/')

def __str__(self):
return '<DTable Storage Server API [ %s ]>' % self.server_url

def get_headers(self, dtable_uuid):
payload = {
'dtable_uuid': uuid_str_to_36_chars(dtable_uuid),
'is_internal': True
}
access_token = jwt.encode(payload, DTABLE_PRIVATE_KEY, algorithm='HS256')
return {'Authorization': f'Token {access_token}'}

def get_dtable(self, dtable_uuid):
dtable_uuid = uuid_str_to_36_chars(dtable_uuid)
url = self.server_url + '/dtables/' + dtable_uuid
response = requests.get(url, timeout=TIMEOUT)
url = self.server_url + f'/api/v1/internal/storage/dtables/{dtable_uuid}/'
response = requests.get(url, headers=self.get_headers(dtable_uuid), timeout=TIMEOUT)
try:
data = parse_response(response)
except StorageAPIError as e:
Expand All @@ -57,22 +65,24 @@ def get_dtable(self, dtable_uuid):

def create_empty_dtable(self, dtable_uuid):
dtable_uuid = uuid_str_to_36_chars(dtable_uuid)
url = self.server_url + '/dtables/' + dtable_uuid
response = requests.put(url, timeout=TIMEOUT)
url = self.server_url + f'/api/v1/internal/storage/dtables/{dtable_uuid}/'
response = requests.put(url, headers=self.get_headers(dtable_uuid), timeout=TIMEOUT)
data = parse_response(response)
return data

def save_dtable(self, dtable_uuid, json_string):
dtable_uuid = uuid_str_to_36_chars(dtable_uuid)
url = self.server_url + '/dtables/' + dtable_uuid
response = requests.put(url, data=json_string, timeout=TIMEOUT)
url = self.server_url + f'/api/v1/internal/storage/dtables/{dtable_uuid}/'
headers = self.get_headers(dtable_uuid)
headers['Content-Type'] = 'application/json'
response = requests.put(url, headers=headers, data=json_string, timeout=TIMEOUT)
data = parse_response(response)
return data

def delete_dtable(self, dtable_uuid):
dtable_uuid = uuid_str_to_36_chars(dtable_uuid)
url = self.server_url + '/dtables/' + dtable_uuid
response = requests.delete(url, timeout=TIMEOUT)
url = self.server_url + f'/api/v1/internal/storage/dtables/{dtable_uuid}/'
response = requests.delete(url, headers=self.get_headers(dtable_uuid), timeout=TIMEOUT)
try:
data = parse_response(response)
except StorageAPIError as e:
Expand Down