Skip to content
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.

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

Fix deprecated warnings #193

Merged
merged 2 commits into from
Jan 16, 2025
Merged
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
12 changes: 6 additions & 6 deletions src/isar_robot/config/settings.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import importlib.resources as pkg_resources

from importlib.resources import as_file, files
from pydantic import Field
from pydantic_settings import BaseSettings, SettingsConfigDict


class Settings(BaseSettings):
def __init__(self) -> None:
try:
with pkg_resources.path("isar_robot.config", "settings.env") as path:
env_file_path = path
source = files("isar_robot").joinpath("config").joinpath("settings.env")
with as_file(source) as eml:
env_file = eml
except ModuleNotFoundError:
env_file_path = None
super().__init__(_env_file=env_file_path)
env_file = None
super().__init__(_env_file=env_file)

STEP_DURATION_IN_SECONDS: float = Field(default=5.0)
MISSION_DURATION_IN_SECONDS: float = Field(default=5.0)
Expand Down
10 changes: 5 additions & 5 deletions src/isar_robot/inspections.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
import random
from datetime import datetime
from datetime import datetime, timezone
from pathlib import Path
from typing import Union

Expand Down Expand Up @@ -43,7 +43,7 @@


def create_image(task_actions: Union[TakeImage, TakeThermalImage]) -> Image:
now: datetime = datetime.utcnow()
now: datetime = datetime.now(timezone.utc)
image_metadata: ImageMetadata = ImageMetadata(
start_time=now,
pose=telemetry.get_pose(),
Expand All @@ -60,7 +60,7 @@ def create_image(task_actions: Union[TakeImage, TakeThermalImage]) -> Image:


def create_video(task_actions: TakeVideo) -> Video:
now: datetime = datetime.utcnow()
now: datetime = datetime.now(timezone.utc)
video_metadata: VideoMetadata = VideoMetadata(
start_time=now,
pose=telemetry.get_pose(),
Expand All @@ -78,7 +78,7 @@ def create_video(task_actions: TakeVideo) -> Video:


def create_thermal_video(task_actions: TakeThermalVideo):
now: datetime = datetime.utcnow()
now: datetime = datetime.now(timezone.utc)
thermal_video_metadata: ThermalVideoMetadata = ThermalVideoMetadata(
start_time=now,
pose=telemetry.get_pose(),
Expand All @@ -98,7 +98,7 @@ def create_thermal_video(task_actions: TakeThermalVideo):


def create_audio(task_actions: RecordAudio):
now: datetime = datetime.utcnow()
now: datetime = datetime.now(timezone.utc)
audio_metadata: AudioMetadata = AudioMetadata(
start_time=now,
pose=telemetry.get_pose(),
Expand Down
10 changes: 5 additions & 5 deletions src/isar_robot/telemetry.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import json
import random
from datetime import datetime
from datetime import datetime, timezone

from alitra import Frame, Orientation, Pose, Position
from robot_interface.telemetry.payloads import (
Expand Down Expand Up @@ -50,7 +50,7 @@ def get_pose_telemetry(isar_id: str, robot_name: str) -> str:
pose=get_pose(),
isar_id=isar_id,
robot_name=robot_name,
timestamp=datetime.utcnow(),
timestamp=datetime.now(timezone.utc),
)
return json.dumps(pose_payload, cls=EnhancedJSONEncoder)

Expand All @@ -60,7 +60,7 @@ def get_battery_telemetry(isar_id: str, robot_name: str) -> str:
battery_level=_get_battery_level(),
isar_id=isar_id,
robot_name=robot_name,
timestamp=datetime.utcnow(),
timestamp=datetime.now(timezone.utc),
)
return json.dumps(battery_payload, cls=EnhancedJSONEncoder)

Expand All @@ -71,7 +71,7 @@ def get_obstacle_status_telemetry(isar_id: str, robot_name: str) -> str:
obstacle_status=_get_obstacle_status(),
isar_id=isar_id,
robot_name=robot_name,
timestamp=datetime.utcnow(),
timestamp=datetime.now(timezone.utc),
)
)
return json.dumps(obstacle_status_payload, cls=EnhancedJSONEncoder)
Expand All @@ -82,6 +82,6 @@ def get_pressure_telemetry(isar_id: str, robot_name: str) -> str:
pressure_level=_get_pressure_level(),
isar_id=isar_id,
robot_name=robot_name,
timestamp=datetime.utcnow(),
timestamp=datetime.now(timezone.utc),
)
return json.dumps(pressure_payload, cls=EnhancedJSONEncoder)
Loading