Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion clients/python/sliderule/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,21 @@
12: "STRING"
}

def _json_encoder(obj):
if isinstance(obj, (bytes, bytearray)):
return obj.decode('utf-8')
if isinstance(obj, numpy.integer):
return int(obj)
if isinstance(obj, numpy.floating):
return float(obj)
if isinstance(obj, numpy.ndarray):
return obj.tolist()
if isinstance(obj, numpy.bool_):
return bool(obj)
if isinstance(obj, numpy.void):
return None
return obj

###############################################################################
# CLASSES
###############################################################################
Expand Down Expand Up @@ -211,7 +226,7 @@ def source (self, api, parm=None, stream=False, callbacks=None, path="/source",

# Construct Payload
if isinstance(parm, dict):
payload = json.dumps(parm)
payload = json.dumps(parm, default=_json_encoder)
else:
payload = parm

Expand Down
32 changes: 32 additions & 0 deletions clients/python/tests/test_apis.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
"""Tests for sliderule APIs."""

import json
import numpy as np
import pytest
import requests
import sliderule
from sliderule import icesat2
from sliderule.session import Session
from pathlib import Path
import os

Expand Down Expand Up @@ -129,3 +133,31 @@ def test_toregion(self):
region = sliderule.toregion(os.path.join(TESTDIR, 'data/polygon.geojson'))
assert len(region["poly"]) == 5 # 5 coordinate pairs
assert {'lon', 'lat'} <= region["poly"][0].keys()

def test_toregion_int_coords_json_serializable(self):
region = sliderule.toregion([
{"lon": -120, "lat": -25},
{"lon": -95, "lat": -25},
{"lon": -95, "lat": 0},
{"lon": -120, "lat": 0},
{"lon": -120, "lat": -25},
])
json.dumps(region["poly"])

def test_toregion_numpy_int_coords_request_serializable(self, monkeypatch):
session = Session()

def fake_get(*args, **kwargs):
raise requests.ConnectionError("blocked")

monkeypatch.setattr(session.session, "get", fake_get)

poly = [
{"lon": np.int64(-120), "lat": np.int64(-25)},
{"lon": np.int64(-95), "lat": np.int64(-25)},
{"lon": np.int64(-95), "lat": np.int64(0)},
{"lon": np.int64(-120), "lat": np.int64(0)},
{"lon": np.int64(-120), "lat": np.int64(-25)},
]
rsps = session.source("version", {"poly": poly}, stream=False)
assert rsps == "Connection error"
Loading