diff --git a/armarx_memory/client/Commit.py b/armarx_memory/client/Commit.py index 4b947b1ea368bcb4b4417b48eb714c1f7a2828a5..33b99d9c98a9a304aedc2bb20da45d036bdcd755 100644 --- a/armarx_memory/client/Commit.py +++ b/armarx_memory/client/Commit.py @@ -19,7 +19,7 @@ class EntityUpdate(ice_twin.IceTwin): self, entity_id: MemoryID = None, instances_data: List[AronIceTypes.Data] = None, - time_created_usec: Optional[int] = None, + time_referenced_usec: Optional[int] = None, confidence: Optional[float] = None, time_sent_usec: Optional[int] = None, ): @@ -27,13 +27,13 @@ class EntityUpdate(ice_twin.IceTwin): self.entity_id: MemoryID = entity_id or MemoryID() self.instances_data = instances_data or [] - self.time_created_usec = time_created_usec or time_usec() + self.time_referenced_usec = time_referenced_usec or time_usec() self.confidence = 1.0 if confidence is None else float(confidence) self.time_sent_usec: Optional[int] = time_sent_usec - def set_time_created_to_now(self): - self.time_created_usec = self.now() + def set_time_referenced_to_now(self): + self.time_referenced_usec = self.now() @staticmethod def now(): @@ -46,33 +46,33 @@ class EntityUpdate(ice_twin.IceTwin): def _set_to_ice(self, dto: armem.data.Commit): dto.entityID = self.entity_id.to_ice() dto.instancesData = self.instances_data - dto.timeCreated = date_time_conv.to_ice(self.time_created_usec) + dto.referencedTime = date_time_conv.to_ice(self.time_referenced_usec) dto.confidence = self.confidence - dto.timeSent = date_time_conv.to_ice( + dto.sentTime = date_time_conv.to_ice( self.time_sent_usec if self.time_sent_usec is not None else -1 ) def _set_from_ice(self, dto): self.entity_id.set_from_ice(dto.entityID) self.instances_data = dto.instancesData - self.time_created_usec = date_time_conv.from_ice(dto.timeCreated) + self.time_referenced_usec = date_time_conv.from_ice(dto.referencedTime) self.confidence = dto.confidence - self.time_sent_usec = date_time_conv.from_ice(dto.timeSent) + self.time_sent_usec = date_time_conv.from_ice(dto.sentTime) assert ( - self.time_created_usec > 0 - ), f"The time sent must be valid: {self.time_created_usec}" + self.time_referenced_usec > 0 + ), f"The time sent must be valid: {self.time_referenced_usec}" assert ( self.time_sent_usec > 0 or self.time_sent_usec is None - ), f"The time sent must be valid: {self.time_created_usec}" + ), f"The time sent must be valid: {self.time_sent_usec}" def __repr__(self): return "<{c} id={i} t={t} c={con:.3f} with {n} instance{ns}>".format( c=self.__class__.__name__, i=self.entity_id, - t=self.time_created_usec, + t=self.time_referenced_usec, n=len(self.instances_data), ns="" if len(self.instances_data) == 1 else "s", con=self.confidence, diff --git a/armarx_memory/client/detail/SpecialClientBase.py b/armarx_memory/client/detail/SpecialClientBase.py index 68ab5aee90c718878c3007d5fd77f3c433ecd228..06ead2120f101e93af5820585200f1c226023ab1 100644 --- a/armarx_memory/client/detail/SpecialClientBase.py +++ b/armarx_memory/client/detail/SpecialClientBase.py @@ -45,7 +45,7 @@ class SpecialWriterBase(SpecialClientBase): def commit( self, entity_id: MemoryID, - time_created_usec: Optional[int] = None, + referenced_time_usec: Optional[int] = None, confidence: Optional[float] = None, **data_kwargs, ): @@ -54,7 +54,7 @@ class SpecialWriterBase(SpecialClientBase): commit.add( self.make_update( entity_id=entity_id, - time_created_usec=time_created_usec, + referenced_time_usec=referenced_time_usec, confidence=confidence, **data_kwargs, ) @@ -66,7 +66,7 @@ class SpecialWriterBase(SpecialClientBase): provider_name: Optional[str] = None, entity_name: Optional[str] = None, entity_id: Optional[MemoryID] = None, - time_created_usec: Optional[int] = None, + referenced_time_usec: Optional[int] = None, confidence: Optional[float] = None, data=None, **data_kwargs, @@ -90,7 +90,7 @@ class SpecialWriterBase(SpecialClientBase): return EntityUpdate( entity_id=entity_id, - time_created_usec=time_created_usec, + referenced_time_usec=referenced_time_usec, confidence=confidence, instances_data=data, ) diff --git a/armarx_memory/segments/ObjectInstance.py b/armarx_memory/segments/ObjectInstance.py index 335f3d295558206d6daef3b5ba500adda15e74f9..f0864380ff10f6f9794dc5052cfc5d14b8423627 100644 --- a/armarx_memory/segments/ObjectInstance.py +++ b/armarx_memory/segments/ObjectInstance.py @@ -67,14 +67,14 @@ class ObjectInstanceWriter(ObjectInstanceClientBase): classID: MemoryID, sourceID: MemoryID, pose: np.ndarray, - time_created_usec=None, + referenced_time_usec=None, **kwargs ): object_instance = ObjectInstance(classID=classID, sourceID=sourceID, pose=pose) commit = Commit() commit.add( entity_id=entity_id, - time_created_usec=time_created_usec, + referenced_time_usec=referenced_time_usec, instances_data=[object_instance.to_aron()], **kwargs ) diff --git a/armarx_memory/segments/Person.py b/armarx_memory/segments/Person.py index a1002beb7552b261728c3bf5143e8c62fdf764fe..93631fe5c3c2a1921a9075ba634bdb24c50172e0 100644 --- a/armarx_memory/segments/Person.py +++ b/armarx_memory/segments/Person.py @@ -62,14 +62,14 @@ class PersonWriter(PersonClientBase): given_name: str, family_name: str, roles: List, - time_created_usec=None, + referenced_time_usec=None, **kwargs ): person = Person(given_name=given_name, family_name=family_name, roles=roles) commit = Commit() commit.add( entity_id=entity_id, - time_created_usec=time_created_usec, + referenced_time_usec=referenced_time_usec, instances_data=[person.to_aron()], **kwargs, ) diff --git a/armarx_memory/segments/PersonInstance.py b/armarx_memory/segments/PersonInstance.py index 47a5d4495d482b0b555e645fd01b2533979694e1..e36fed0fa761e130d2a3180430e9126eeb24757b 100644 --- a/armarx_memory/segments/PersonInstance.py +++ b/armarx_memory/segments/PersonInstance.py @@ -58,14 +58,14 @@ class PersonInstanceWriter(PersonInstanceClientBase): entity_id: MemoryID, personID: MemoryID, pose: np.ndarray, - time_created_usec=None, + referenced_time_usec=None, **kwargs ): person_instance = PersonInstance(personID=personID, pose=pose) commit = Commit() commit.add( entity_id=entity_id, - time_created_usec=time_created_usec, + referenced_time_usec=referenced_time_usec, instances_data=[person_instance.to_aron()], **kwargs ) diff --git a/armarx_memory/segments/SpeechToText.py b/armarx_memory/segments/SpeechToText.py index 353c844fef284dd62940919877c2e9c5653055ed..a1d510cf92be84c976243a2ac0a45ab5e5016781 100644 --- a/armarx_memory/segments/SpeechToText.py +++ b/armarx_memory/segments/SpeechToText.py @@ -59,12 +59,12 @@ class SpeechToTextWriter(SpeechToTextClientBase): ) def commit( - self, entity_id: MemoryID, text: str, confidence: float, time_created_usec=None + self, entity_id: MemoryID, text: str, confidence: float, referenced_time_usec=None ): commit = Commit() commit.add( entity_id=entity_id, - time_created_usec=time_created_usec, + referenced_time_usec=referenced_time_usec, confidence=confidence, instances_data=[SpeechToText(text=text).to_aron()], ) diff --git a/armarx_memory/segments/base_segment.py b/armarx_memory/segments/base_segment.py index a8ac5b56668f9b31020898f2b4fd2b27721e0cfc..3eed617536c3130925b6d832d0ee8f8bfa9b6e1f 100644 --- a/armarx_memory/segments/base_segment.py +++ b/armarx_memory/segments/base_segment.py @@ -97,13 +97,13 @@ class BaseWriter(BaseClient, ABC): super().__init__() self.writer = writer - def commit(self, entity_id: MemoryID, time_created_usec=None, **kwargs): + def commit(self, entity_id: MemoryID, referenced_time_usec=None, **kwargs): from armarx_memory.aron.conversion import to_aron commit = Commit() commit.add( entity_id=entity_id, - time_created_usec=time_created_usec, + referenced_time_usec=referenced_time_usec, instances_data=[to_aron(kwargs)], ) return self.writer.commit(commit.to_ice()) diff --git a/armarx_memory/segments/human/profile.py b/armarx_memory/segments/human/profile.py index 2da1c849056ac368ae3c04acb81198142e5d0fec..1d641dbde3e29bffb1c4cd3897a0b215c58fe4fb 100644 --- a/armarx_memory/segments/human/profile.py +++ b/armarx_memory/segments/human/profile.py @@ -84,12 +84,12 @@ class ProfileWriter(ProfileClientBase): ) def commit( - self, entity_id: MemoryID, profile: Profile, time_created_usec=None, **kwargs + self, entity_id: MemoryID, profile: Profile, referenced_time_usec=None, **kwargs ): commit = Commit() commit.add( entity_id=entity_id, - time_created_usec=time_created_usec, + referenced_time_usec=referenced_time_usec, instances_data=[profile.to_aron_ice()], **kwargs, ) diff --git a/armarx_memory/segments/speech/text_to_speech.py b/armarx_memory/segments/speech/text_to_speech.py index 8f8c0c5aaed674148cd6dcc95c8c31f4af90b24a..422985817754ef62264534a6df021c21cde942ad 100644 --- a/armarx_memory/segments/speech/text_to_speech.py +++ b/armarx_memory/segments/speech/text_to_speech.py @@ -41,13 +41,13 @@ class TextToSpeechWriter(TextToSpeechClientBase): self, entity_id: MemoryID, text: str, - time_created_usec=None, + referenced_time_usec=None, **kwargs, ): commit = Commit() commit.add( entity_id=entity_id, - time_created_usec=time_created_usec, + referenced_time_usec=referenced_time_usec, instances_data=[TextToSpeech(text=text).to_aron_ice()], **kwargs, ) diff --git a/examples/memory_client.py b/examples/memory_client.py index 044d43c5fda02265bb6acdec3888ac882078b340..4cfb6f6e7c33000ec5fd49eaa30c164143d900d4 100755 --- a/examples/memory_client.py +++ b/examples/memory_client.py @@ -57,7 +57,7 @@ def write(entity_id: mem.MemoryID, instances_data: List[Dict]): commit.add( memcl.EntityUpdate( entity_id=entity_id, - time_created_usec=now, + referenced_time_usec=now, instances_data=[aron_conv.to_aron(data) for data in instances_data], ) )