Skip to content

Commit 3bcbaea

Browse files
authored
Merge pull request #391 from vespa-engine/tgm/remove-unused-serialization
remove serialization code
2 parents a9f6baa + 53cbaca commit 3bcbaea

5 files changed

+18
-555
lines changed

vespa/deployment.py

+2-42
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from io import BytesIO
1010
from pathlib import Path
1111
from time import sleep, strftime, gmtime
12-
from typing import Union, IO, Optional, Mapping
12+
from typing import Union, IO, Optional
1313

1414
import docker
1515
import requests
@@ -19,15 +19,14 @@
1919
from cryptography.hazmat.primitives.asymmetric import ec
2020

2121
from vespa.application import Vespa
22-
from vespa.json_serialization import ToJson, FromJson
2322
from vespa.package import ApplicationPackage
2423

2524
CFG_SERVER_START_TIMEOUT = 300
2625
APP_INIT_TIMEOUT = 300
2726
DOCKER_TIMEOUT = 600
2827

2928

30-
class VespaDocker(ToJson, FromJson["VespaDocker"]):
29+
class VespaDocker(object):
3130
def __init__(
3231
self,
3332
port: int = 8080,
@@ -310,45 +309,6 @@ def restart_services(self):
310309
self.stop_services()
311310
self.start_services()
312311

313-
@staticmethod
314-
def from_dict(mapping: Mapping) -> "VespaDocker":
315-
try:
316-
if mapping["container_id"] is not None:
317-
vespa_docker = VespaDocker.from_container_name_or_id(
318-
name_or_id=mapping["container_id"]
319-
)
320-
return vespa_docker
321-
elif mapping["container_name"] is not None:
322-
vespa_docker = VespaDocker.from_container_name_or_id(
323-
name_or_id=mapping["container_name"]
324-
)
325-
return vespa_docker
326-
else:
327-
print(
328-
"Unable to instantiate VespaDocker from a running container. Starting new container."
329-
)
330-
except ValueError:
331-
print(
332-
"Unable to instantiate VespaDocker from a running container. Starting new container."
333-
)
334-
vespa_docker = VespaDocker(
335-
port=mapping["port"],
336-
container_memory=mapping["container_memory"],
337-
container_image=mapping["container_image"],
338-
)
339-
return vespa_docker
340-
341-
@property
342-
def to_dict(self) -> Mapping:
343-
return {
344-
"container_id": self.container_id,
345-
"container_name": self.container_name,
346-
"url": self.url,
347-
"port": self.local_port,
348-
"container_memory": self.container_memory,
349-
"container_image": self.container_image,
350-
}
351-
352312
def __eq__(self, other):
353313
if not isinstance(other, self.__class__):
354314
return False

vespa/json_serialization.py

-78
This file was deleted.

0 commit comments

Comments
 (0)