Skip to content
Merged

Numpy #283

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
24 changes: 23 additions & 1 deletion namer/web/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
A wrapper allowing shutdown of a Flask server.
"""

import datetime
import logging
import mimetypes
import datetime
from queue import Queue
from threading import Thread
from typing import Any, List, Optional, Union

import numpy
import orjson
from flask import Blueprint, Flask
from flask.json.provider import _default, JSONProvider
Expand Down Expand Up @@ -192,4 +193,25 @@ def default(obj):
if isinstance(obj, ImageHash):
return str(obj)

if isinstance(obj, (numpy.int_, numpy.intc, numpy.intp, numpy.int8, numpy.int16, numpy.int32, numpy.int64, numpy.uint8, numpy.uint16, numpy.uint32, numpy.uint64)):
return int(obj)

elif isinstance(obj, (numpy.float_, numpy.float16, numpy.float32, numpy.float64)):
return float(obj)

elif isinstance(obj, (numpy.complex_, numpy.complex64, numpy.complex128)):
return {
'real': obj.real,
'imag': obj.imag
}

elif isinstance(obj, (numpy.ndarray,)):
return obj.tolist()

elif isinstance(obj, (numpy.bool_)):
return bool(obj)

elif isinstance(obj, (numpy.void)):
return None

return _default(obj)
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,41 +17,41 @@
"bootstrap-icons": "^1.13.1",
"datatables.net": "^2.3.2",
"datatables.net-bs5": "^2.3.2",
"datatables.net-buttons": "^3.2.3",
"datatables.net-buttons-bs5": "^3.2.3",
"datatables.net-buttons": "^3.2.4",
"datatables.net-buttons-bs5": "^3.2.4",
"datatables.net-colreorder": "^2.1.1",
"datatables.net-colreorder-bs5": "^2.1.1",
"datatables.net-fixedheader": "^4.0.3",
"datatables.net-fixedheader-bs5": "^4.0.3",
"datatables.net-responsive": "^3.0.4",
"datatables.net-responsive-bs5": "^3.0.4",
"datatables.net-responsive": "^3.0.5",
"datatables.net-responsive-bs5": "^3.0.5",
"jquery": "^3.7.1",
"lodash": "^4.17.21"
},
"devDependencies": {
"@babel/core": "^7.27.4",
"@babel/preset-env": "^7.27.2",
"@babel/core": "^7.28.0",
"@babel/preset-env": "^7.28.0",
"@eslint/eslintrc": "^3.3.1",
"@eslint/js": "^9.29.0",
"@eslint/js": "^9.30.1",
"babel-loader": "^10.0.0",
"copy-webpack-plugin": "^13.0.0",
"css-loader": "^7.1.2",
"css-minimizer-webpack-plugin": "^7.0.2",
"eslint": "^9.29.0",
"eslint": "^9.30.1",
"eslint-config-standard": "^17.1.0",
"file-loader": "^6.2.0",
"globals": "^16.2.0",
"globals": "^16.3.0",
"html-minimizer-webpack-plugin": "^5.0.2",
"husky": "^9.1.7",
"lint-staged": "^16.1.2",
"mini-css-extract-plugin": "^2.9.2",
"postcss": "^8.5.6",
"postcss-loader": "^8.1.1",
"postcss-preset-env": "^10.2.3",
"postcss-preset-env": "^10.2.4",
"sass": "^1.89.2",
"sass-loader": "^16.0.5",
"terser-webpack-plugin": "^5.3.14",
"webpack": "^5.99.9",
"webpack": "^5.100.0",
"webpack-cli": "^6.0.1"
},
"engines": {
Expand Down
Loading