Skip to content

Commit

Permalink
Merge pull request #1015 from Pythagora-io/use-utc-exec-logs
Browse files Browse the repository at this point in the history
Use UTC for started_at colum in exec_logs.
  • Loading branch information
LeonOstrez authored Jun 13, 2024
2 parents 9fd8ddd + a6f54c8 commit c97496c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
6 changes: 3 additions & 3 deletions core/agents/executor.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime
from datetime import datetime, timezone
from typing import Optional

from pydantic import BaseModel, Field
Expand Down Expand Up @@ -96,13 +96,13 @@ async def run(self) -> AgentResponse:
self.next_state.action = f'Skip "{cmd_name}"'
return AgentResponse.done(self)

started_at = datetime.now()
started_at = datetime.now(timezone.utc)

log.info(f"Running command `{cmd}` with timeout {timeout}s")
status_code, stdout, stderr = await self.process_manager.run_command(cmd, timeout=timeout)
llm_response = await self.check_command_output(cmd, timeout, stdout, stderr, status_code)

duration = (datetime.now() - started_at).total_seconds()
duration = (datetime.now(timezone.utc) - started_at).total_seconds()

self.complete()
self.next_state.action = f'Run "{cmd_name}"'
Expand Down
3 changes: 2 additions & 1 deletion core/db/models/exec_log.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from sqlalchemy import ForeignKey, inspect
from sqlalchemy.orm import Mapped, mapped_column, relationship
from sqlalchemy.sql import func

from core.db.models import Base
from core.proc.exec_log import ExecLog as ExecLogData
Expand All @@ -21,7 +22,7 @@ class ExecLog(Base):
project_state_id: Mapped[Optional[UUID]] = mapped_column(ForeignKey("project_states.id", ondelete="SET NULL"))

# Attributes
started_at: Mapped[datetime] = mapped_column()
started_at: Mapped[datetime] = mapped_column(server_default=func.now())
duration: Mapped[float] = mapped_column()
cmd: Mapped[str] = mapped_column()
cwd: Mapped[str] = mapped_column()
Expand Down
4 changes: 2 additions & 2 deletions core/proc/exec_log.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
from datetime import datetime
from datetime import datetime, timezone
from typing import Optional

from pydantic import BaseModel, Field


class ExecLog(BaseModel):
started_at: datetime = Field(default_factory=datetime.now)
started_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
duration: float = Field(description="The duration of the command/process run in seconds")
cmd: str = Field(description="The full command (as executed in the shell)")
cwd: str = Field(description="The working directory for the command (relative to project root)")
Expand Down

0 comments on commit c97496c

Please sign in to comment.