(20241225) Work started on upgrades and server-registration module.
This commit is contained in:
+45
-4
@@ -74,6 +74,50 @@ import datetime
|
||||
# *****************************************************************************************************************
|
||||
|
||||
|
||||
class LogChainRequestData(BaseModel):
|
||||
|
||||
limit: int = Field(
|
||||
description = "the max. logs to pick",
|
||||
default = 25,
|
||||
frozen = True
|
||||
)
|
||||
|
||||
skip: int = Field(
|
||||
description = "how many initial matches to skip before picking logs; needed for pagination",
|
||||
default = 0,
|
||||
frozen = True
|
||||
)
|
||||
|
||||
sort: dict = Field(
|
||||
description = "the sorting conditions for the picked logs",
|
||||
default = {"ts": 1, "_id": -1},
|
||||
frozen = True
|
||||
)
|
||||
|
||||
projection: dict = Field(
|
||||
description = "to decide what fields are retrieved",
|
||||
default = {"_id": False},
|
||||
frozen = True
|
||||
)
|
||||
|
||||
# ┏┓ ┏•
|
||||
# ┃ ┏┓┏┓╋┓┏┓
|
||||
# ┗┛┗┛┛┗┛┗┗┫
|
||||
# ┛
|
||||
|
||||
class Config:
|
||||
extra = "forbid"
|
||||
|
||||
# ┓┏ ┓• ┓ •
|
||||
# ┃┃┏┓┃┓┏┫┏┓╋┓┏┓┏┓
|
||||
# ┗┛┗┻┗┗┗┻┗┻┗┗┗┛┛┗
|
||||
|
||||
pass
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
class LogsByFilterRequestData(BaseModel):
|
||||
|
||||
filter: dict = Field(
|
||||
@@ -117,10 +161,7 @@ class LogsByFilterRequestData(BaseModel):
|
||||
# ┃┃┏┓┃┓┏┫┏┓╋┓┏┓┏┓
|
||||
# ┗┛┗┻┗┗┗┻┗┻┗┗┗┛┛┗
|
||||
|
||||
@field_validator("unsetJson", "setJson", mode = "before")
|
||||
def ensure_non_null(cls, value):
|
||||
if value is None: value = {}
|
||||
return value
|
||||
pass
|
||||
|
||||
|
||||
# *****************************************************************************************************************
|
||||
|
||||
+131
-111
@@ -10,7 +10,7 @@
|
||||
|
||||
OBJECTIVE:
|
||||
|
||||
To provide a structure to work with requests surrounding Cred and Data handling.
|
||||
To provide a structure to work with enlisting servers and maintaining their status.
|
||||
|
||||
REFERENCES:
|
||||
|
||||
@@ -36,7 +36,7 @@ sys.path.append(".")
|
||||
sys.path.append("..")
|
||||
|
||||
# For making data behaviour_models:
|
||||
from pydantic import BaseModel, Field, field_validator, PastDatetime, model_validator
|
||||
from pydantic import BaseModel, Field, field_validator, PastDatetime, model_validator, AwareDatetime
|
||||
from typing import Optional, Literal, Union
|
||||
|
||||
# My utils:
|
||||
@@ -74,18 +74,105 @@ import datetime
|
||||
# *****************************************************************************************************************
|
||||
|
||||
|
||||
class CredAndDataSetRequestHeaders(BaseModel):
|
||||
class CoreServerInfoModel(BaseModel):
|
||||
|
||||
scriptId: str = Field(
|
||||
description = "the id of the script for whom you are setting cred/data",
|
||||
frozen = True,
|
||||
alias = "X-Script-Id"
|
||||
hostname: str = Field(
|
||||
description = "the hostname to identify the server",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
scriptDescription: str = Field(
|
||||
description = "a short description of the script and what it does",
|
||||
frozen = True,
|
||||
alias = "X-Script-Desc"
|
||||
os: str = Field(
|
||||
description = "the os the server is running",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
cpu: str = Field(
|
||||
description = "the cpu that the server has in it",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
pid: str | int = Field(
|
||||
description = "the process id that registered the details of this server",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
ppid: str | int = Field(
|
||||
description = "the parent process id that registered the details of this server",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
ipAddr: str | None = Field(
|
||||
description = "the ip address of the server",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
portNo: str | None = Field(
|
||||
description = "the port no. that this service is running on",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
project: str = Field(
|
||||
description = "the name of the project that this server is running",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
service: str = Field(
|
||||
description = "the service in the said project that this server is running",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
healthCheckUrl: str = Field(
|
||||
description = "a get request will be sent to this url to see if the server is up",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
healthCheckInterval: int = Field(
|
||||
description = "the seconds after which to check for the service being up",
|
||||
ge = 30,
|
||||
frozen = True
|
||||
)
|
||||
|
||||
healthAlertUrl: str = Field(
|
||||
description = "a get request will be sent to this url when the server goes offline",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
online: bool = Field(
|
||||
description = "whether this service is online or not",
|
||||
default = False,
|
||||
frozen = False
|
||||
)
|
||||
|
||||
batchId: str | None = Field(
|
||||
description = "set some value here when checking the status of this server, set it to null once done",
|
||||
default = None,
|
||||
frozen = False
|
||||
)
|
||||
|
||||
batchTs: AwareDatetime | None = Field(
|
||||
description = "set the time (utc) when checking the status of this server, set it to null once done",
|
||||
default = None,
|
||||
frozen = False
|
||||
)
|
||||
|
||||
firstRegTs: AwareDatetime = Field(
|
||||
description = "the first time (utc) this server was registered in the database",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
lastRegTs: AwareDatetime = Field(
|
||||
description = "the last time (utc) this server was registered in the database",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
lastCheckTs: AwareDatetime = Field(
|
||||
description = "the last time (utc) this server was checked for being online",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
checkAfterTs: AwareDatetime = Field(
|
||||
description = "the time (utc) after which this server needs to be checked again for being online",
|
||||
frozen = True
|
||||
)
|
||||
|
||||
# ┏┓ ┏•
|
||||
@@ -94,114 +181,47 @@ class CredAndDataSetRequestHeaders(BaseModel):
|
||||
# ┛
|
||||
|
||||
class Config:
|
||||
extra = "allow"
|
||||
|
||||
def model_dump(self, *args, **kwargs):
|
||||
return super().model_dump(*args, by_alias = True, **kwargs)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
class CredAndDataGetRequestHeaders(BaseModel):
|
||||
|
||||
scriptId: str = Field(
|
||||
description = "the id of the script for whom you are getting cred/data",
|
||||
frozen = True,
|
||||
alias = "X-Script-Id"
|
||||
)
|
||||
|
||||
# ┏┓ ┏•
|
||||
# ┃ ┏┓┏┓╋┓┏┓
|
||||
# ┗┛┗┛┛┗┛┗┗┫
|
||||
# ┛
|
||||
|
||||
class Config:
|
||||
extra = "allow"
|
||||
|
||||
def model_dump(self, *args, **kwargs):
|
||||
return super().model_dump(*args, by_alias = True, **kwargs)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
class CredAndDataUpdateRequestHeaders(BaseModel):
|
||||
|
||||
scriptId: str = Field(
|
||||
description = "the id of the script for whom you are updating cred/data",
|
||||
frozen = True,
|
||||
alias = "X-Script-Id"
|
||||
)
|
||||
|
||||
# ┏┓ ┏•
|
||||
# ┃ ┏┓┏┓╋┓┏┓
|
||||
# ┗┛┗┛┛┗┛┗┗┫
|
||||
# ┛
|
||||
|
||||
class Config:
|
||||
extra = "allow"
|
||||
|
||||
def model_dump(self, *args, **kwargs):
|
||||
return super().model_dump(*args, by_alias = True, **kwargs)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
class CredAndDataUpdateRequestData(BaseModel):
|
||||
|
||||
unsetJson: dict = Field(
|
||||
description = "the items to unset; this is performed first",
|
||||
frozen = True,
|
||||
alias = "unset"
|
||||
)
|
||||
|
||||
setJson: dict = Field(
|
||||
description = "the items to set; this is performed after the 'unset' operation",
|
||||
frozen = True,
|
||||
alias = "set"
|
||||
)
|
||||
|
||||
# ┏┓ ┏•
|
||||
# ┃ ┏┓┏┓╋┓┏┓
|
||||
# ┗┛┗┛┛┗┛┗┗┫
|
||||
# ┛
|
||||
|
||||
class Config:
|
||||
extra = "forbid"
|
||||
extra = "ignore"
|
||||
|
||||
# ┓┏ ┓• ┓ •
|
||||
# ┃┃┏┓┃┓┏┫┏┓╋┓┏┓┏┓
|
||||
# ┗┛┗┻┗┗┗┻┗┻┗┗┗┛┛┗
|
||||
|
||||
@field_validator("unsetJson", "setJson", mode = "before")
|
||||
def ensure_non_null(cls, value):
|
||||
if value is None: value = {}
|
||||
@staticmethod
|
||||
def parse_date_time(value):
|
||||
|
||||
# If a null value was given,
|
||||
# we can't do anything:
|
||||
if not value: value = None
|
||||
|
||||
# If the input is a string:
|
||||
if isinstance(value, str):
|
||||
value = value.strip()
|
||||
value = date_time.parse_date_time(
|
||||
input_value = value,
|
||||
timezone = date_time.TIMEZONE_UTC,
|
||||
date_formats = ["%Y-%m-%d"]
|
||||
)
|
||||
|
||||
# If the input is already a date-time object,
|
||||
# we just normalize the timestamp:
|
||||
if isinstance(value, datetime.datetime):
|
||||
value = date_time.to_timezone(
|
||||
value,
|
||||
timezone = date_time.TIMEZONE_UTC
|
||||
)
|
||||
|
||||
# Done here:
|
||||
return value
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
class CredAndDataDeleteRequestHeaders(BaseModel):
|
||||
|
||||
scriptId: str = Field(
|
||||
description = "the id of the script for whom you are deleting cred/data",
|
||||
frozen = True,
|
||||
alias = "X-Script-Id"
|
||||
@field_validator(
|
||||
"batchTs",
|
||||
"firstRegTs", "lastRegTs",
|
||||
"lastCheckTs", "checkAfterTs",
|
||||
mode = "before"
|
||||
)
|
||||
|
||||
# ┏┓ ┏•
|
||||
# ┃ ┏┓┏┓╋┓┏┓
|
||||
# ┗┛┗┛┛┗┛┗┗┫
|
||||
# ┛
|
||||
|
||||
class Config:
|
||||
extra = "allow"
|
||||
|
||||
def model_dump(self, *args, **kwargs):
|
||||
return super().model_dump(*args, by_alias = True, **kwargs)
|
||||
def parse_given_date_time(cls, value):
|
||||
return cls.parse_date_time(value)
|
||||
|
||||
|
||||
# *****************************************************************************************************************
|
||||
|
||||
Reference in New Issue
Block a user